Michael Niedermayer bd4ebbbbed Merge remote-tracking branch 'qatar/master' ... * qatar/master: proresdsp: fix function prototypes. prores-idct: fix overflow in c code. fate: update prores-alpha ref after changing pix_fmt to yuv444p10le prores: add missing feature warning for alpha mov: 10l: Terminate string with 0 not '0' mov: Prevent illegal writes when chapter titles are very short. prores: add appropriate -fix_fmt parameter to FATE command riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER Conflicts: libavcodec/avcodec.h libavformat/mov.c tests/fate/prores.mak tests/ref/acodec/g726 tests/ref/fate/prores-alpha Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-10-14 22:24:00 +02:00
..
ac3_fixed	ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.	2011-09-05 10:09:44 -04:00
adpcm_ima_qt	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
adpcm_ima_wav	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
adpcm_ms	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
adpcm_swf	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
adpcm_yam	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
alac	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
aref	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
flac	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
g723_1	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
g726	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
mp2	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
pcm	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
wmav1	tiny_psnr: skip wav headers on input files	2010-07-09 16:06:05 +00:00
wmav2	tiny_psnr: skip wav headers on input files	2010-07-09 16:06:05 +00:00