diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-31 23:16:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-01 00:09:05 +0200 |
| commit | f6a8ce98a7bce601a7db4a8f2a615822dc8f71bd (patch) | |
| tree | 25eca30f64783b92220d8e75bdd8551842d22752 /libswscale | |
| parent | 0abbd3adb6a28c088e121bf3da6c04225398bee4 (diff) | |
| parent | 5ac4952a5808cc8cfe01031ca9d4df7d072f453c (diff) | |
| download | ffmpeg-f6a8ce98a7bce601a7db4a8f2a615822dc8f71bd.tar.gz | |
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>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions