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
..
2011-09-05 10:09:44 -04:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-05-02 18:38:01 +02:00
2011-05-02 18:38:01 +02:00
2011-05-02 18:38:01 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-12-07 14:50:50 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-03-17 19:51:28 +00:00
2010-07-20 10:09:54 +00:00
2011-05-10 07:53:19 -04:00
2011-05-02 18:38:01 +02:00
2011-09-08 20:53:37 +02:00
2010-07-20 10:09:54 +00:00
2011-07-08 19:58:19 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-10-16 21:31:31 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-05-10 07:53:19 -04:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-09-28 02:30:30 +01:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-09-26 09:02:51 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-03-17 19:51:28 +00:00
2011-03-17 19:51:28 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00