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
..
acodec	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
fate	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
lavf	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
lavfi	sws: support yuv444p9/10 output.	2011-10-12 08:27:30 +02:00
seek	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
vsynth1	regression tests: add jpeg2000	2011-09-27 21:32:39 +02:00
vsynth2	regression tests: add jpeg2000	2011-09-27 21:32:39 +02:00