FFmpeg/libavcodec
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-30 02:43:20 +02:00
2011-10-11 14:57:58 -04:00
2011-10-10 21:36:12 +02:00
2011-10-10 21:36:12 +02:00
2011-10-14 20:20:00 +02:00
2011-10-10 21:36:13 +02:00
2011-10-10 02:58:18 +02:00
2011-10-07 02:29:31 +02:00
2011-09-28 18:43:49 +02:00
2011-10-14 21:45:14 +02:00
2011-10-07 17:15:45 +02:00
2011-10-07 02:29:31 +02:00
2011-10-07 16:25:31 +02:00
2011-10-09 03:22:57 +02:00
2011-10-10 21:36:13 +02:00
2011-10-12 18:20:18 -04:00
2011-10-09 03:22:49 +02:00
2011-10-06 23:33:09 +02:00
2011-10-07 00:27:03 +02:00
2011-10-09 03:22:57 +02:00