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
..
aac.mak
als.mak
amrnb.mak
amrwb.mak
dct.mak
fft.mak
h264.mak	Merge remote-tracking branch 'qatar/master'	2011-09-05 22:29:16 +02:00
libavutil.mak
mp3.mak	avconv: move limit_filesize to options context	2011-09-04 13:12:00 +02:00
prores.mak	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
vorbis.mak
vp8.mak