aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate-update.sh
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-05-17 04:47:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-17 04:51:33 +0200
commitf8ae3a2108b612776e886d927b4a7289dde619f1 (patch)
treec10fc78e3c6340c9513f99faadf077ee6c7d2986 /tests/fate-update.sh
parente6e7ba0ce3aadef32f7f16f706c4a0406b5bd70f (diff)
parent901ff51116f831c9082e14c80c7481dd3999aa30 (diff)
downloadffmpeg-f8ae3a2108b612776e886d927b4a7289dde619f1.tar.gz
Merge remote branch 'qatar/master'
12 files changed, 36 insertions(+), 81 deletions(-) yes thats 36 new lines in 14 commits * qatar/master: ffmpeg: fix -aspect cli option Restructure video filter implementation in ffmpeg.c. ffplay: remove audio_write_get_buf_size() forward declaration lavfi: print key-frame and picture type information in ff_dlog_ref() mathops: remove ancient confusing comment cws2fws: Improve error message wording. tools: Check the return value of write(). mpegaudio: move OUT_FMT macro to mpegaudiodec.c mpegaudio: remove OUT_MIN/MAX macros Add missing #includes to mp3_header_(de)compress bsf dct: fix indentation dct: bypass table allocation for DCT_II of size 32 h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64. Remove unused header mpegaudio3.h. Conflicts: ffmpeg.c libavcodec/mpegaudio.h libavcodec/mpegaudio3.h libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate-update.sh')
0 files changed, 0 insertions, 0 deletions