Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Oct 2011 19:56:46 +0000 (21:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Oct 2011 20:24:00 +0000 (22:24 +0200)
commitbd4ebbbbed47761df65dd574dce6d3c56d29e2e7
tree415ffb3c9ed9507a7c6ae115e1c201a85271e4ed
parent4b9e9a57eeadf1ece872b19a433b3c004aaa5e46
parent05c8f119cc6b5727319c56b055af82ac1ded93b5
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>
13 files changed:
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/proresdec_lgpl.c
libavcodec/simple_idct.c
libavcodec/version.h
libavcodec/x86/proresdsp-init.c
libavformat/asfenc.c
libavformat/mov.c
libavformat/riff.c
tests/fate/prores.mak
tests/ref/acodec/g723_1
tests/ref/acodec/g726
tests/ref/acodec/pcm