Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 31 May 2011 21:16:26 +0000 (23:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 31 May 2011 22:09:05 +0000 (00:09 +0200)
commitf6a8ce98a7bce601a7db4a8f2a615822dc8f71bd
tree25eca30f64783b92220d8e75bdd8551842d22752
parent0abbd3adb6a28c088e121bf3da6c04225398bee4
parent5ac4952a5808cc8cfe01031ca9d4df7d072f453c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_drawtext: Replace FFmpeg by Libav in license boilerplate.
  mpegaudiodec: remove unusued code and variables
  improved 'edts' atom writing support
  mpegaudio: clean up compute_antialias() definition
  vp8: fix segmentation race during frame-threading.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegaudiodec.c
libavcodec/mpegaudiodec_float.c
libavcodec/vp8.c
libavformat/movenc.c