ffmpeg/libavformat
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-07-31 19:40:08 +02:00
2011-09-26 00:24:01 +02:00
2011-10-10 02:58:18 +02:00
2011-04-17 23:43:54 +02:00
2011-09-12 22:12:14 +02:00
2011-08-14 00:05:36 +02:00
2011-04-04 02:15:12 +02:00
2011-09-10 05:24:39 +02:00
2011-10-10 21:36:12 +02:00
2011-09-28 16:11:01 +02:00
2011-09-25 12:29:20 +02:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-10-12 04:15:40 +02:00
2011-04-09 03:17:07 +02:00
2011-08-09 19:56:25 +02:00
2011-10-07 22:28:07 +02:00
2011-10-13 16:50:20 +02:00
2011-04-21 03:37:05 +02:00
2011-04-09 03:17:07 +02:00
2011-08-20 00:27:38 +02:00
2011-04-07 03:32:26 +02:00
2011-10-13 16:50:20 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-10-07 16:25:30 +02:00
2011-08-09 19:56:25 +02:00
2011-10-01 01:26:55 +02:00
2011-06-02 20:06:00 +01:00
2011-10-13 20:10:25 +02:00
2011-10-13 16:50:20 +02:00
2011-04-04 02:15:12 +02:00
2011-04-24 03:41:22 +02:00
2011-05-30 02:39:26 +02:00
2011-08-25 21:43:30 +02:00