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
2010-11-12 20:04:41 +00:00
2010-11-12 20:04:41 +00:00
2011-04-12 19:06:26 -04:00
2011-09-11 17:44:20 +02:00
2010-08-21 20:57:24 +00:00
2011-06-30 09:47:32 +01:00
2011-04-12 19:06:26 -04:00
2011-04-12 19:06:26 -04:00
2011-02-25 15:24:35 -05:00
2011-10-12 03:47:51 +02:00
2011-04-12 19:06:26 -04:00
2011-07-03 17:17:54 +01:00
2011-04-12 19:06:26 -04:00
2011-09-16 21:29:58 +02:00
2011-09-11 17:44:20 +02:00
2010-08-31 11:11:25 +00:00
2011-09-23 00:35:31 +02:00
2010-08-28 11:46:03 +00:00
2010-08-28 11:46:03 +00:00
2011-08-17 20:00:06 +02:00
2011-08-26 20:54:36 +02:00
2011-09-13 17:29:23 +02:00
2011-09-11 17:44:20 +02:00
2010-09-11 10:23:02 +00:00
2011-09-30 00:13:26 +02:00
2011-09-30 00:13:26 +02:00
2010-10-02 09:56:21 +00:00
2010-10-02 09:56:21 +00:00
2010-11-29 10:35:57 +00:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-23 08:44:31 -04:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-01-24 22:26:13 +00:00
2010-11-04 21:48:54 +00:00
2011-01-22 03:08:21 +00:00
2011-04-12 19:06:26 -04:00
2011-05-17 00:58:33 +02:00
2011-07-04 16:26:26 +01:00
2011-04-12 19:06:26 -04:00
2011-04-12 19:06:26 -04:00
2011-08-17 20:00:06 +02:00
2011-07-03 18:19:18 +01:00
2010-08-31 11:13:14 +00:00
2011-10-07 19:32:07 +02:00
2011-09-13 17:29:23 +02:00
2010-07-17 10:50:25 +00:00
2011-04-12 19:06:26 -04:00
2010-04-19 11:51:40 +00:00
2011-04-12 19:06:26 -04:00
2010-07-11 12:44:32 +00:00
2011-10-14 19:48:41 +02:00
2011-10-14 19:48:41 +02:00
2011-10-14 19:48:41 +02:00
2011-10-14 21:34:20 +02:00
2011-10-14 21:33:01 +02:00
2011-04-12 19:06:26 -04:00
2011-03-26 16:39:22 -04:00
2011-03-26 16:39:22 -04:00
2011-09-23 20:54:28 -04:00
2011-09-23 20:54:28 -04:00
2011-09-13 17:29:23 +02:00
2011-08-17 20:00:06 +02:00
2011-08-17 15:00:42 +02:00
2010-08-31 20:07:38 +00:00
2011-04-12 19:06:26 -04:00
2011-04-12 19:06:26 -04:00
2011-09-14 11:13:54 +03:00
2011-01-14 22:32:26 +00:00
2010-12-28 23:52:53 +00:00
2011-09-13 17:29:23 +02:00
2011-04-12 19:06:26 -04:00
2011-09-11 17:44:20 +02:00
2011-04-12 19:06:26 -04:00
2011-09-13 17:29:23 +02:00
2010-08-24 20:48:58 +00:00
2010-08-24 20:48:58 +00:00
2011-09-07 12:16:15 +02:00
2011-05-04 07:40:53 -04:00
2011-09-13 17:29:23 +02:00
2010-08-25 17:23:38 +00:00
2011-09-11 17:44:20 +02:00
2011-09-13 17:29:23 +02:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-07-12 20:24:23 +00:00
2010-07-12 20:24:23 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-07-12 20:24:23 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2011-04-12 19:06:26 -04:00
2011-03-22 11:07:46 +00:00
2011-04-12 19:06:26 -04:00
2010-08-28 14:51:51 +00:00
2010-07-11 00:07:31 +00:00
2011-09-11 17:44:20 +02:00
bd4ebbbbed