Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Jun 2012 11:40:13 +0000 (13:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Jun 2012 11:40:13 +0000 (13:40 +0200)
commit514f3e7c02202902badb389904965ca278a0299e
treee37331197c6354f3ac5c1d590ba0af9859fd0075
parent3fab87edc9ff5745d0a5c1634760ae0971d4e725
parent4dfea3e9f065e520f5fc71028472f7f6b9beed52
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

* qatar/release/0.8:
  Update Changelog for the 0.8.3 Release
  Prepare for 0.8.3 Release
  ea: check chunk_size for validity.
  png: check bit depth for PAL8/Y400A pixel formats.
  qdm2: clip array indices returned by qdm2_get_vlc().
  tqi: Pass errors from the MB decoder
  h264: Add check for invalid chroma_format_idc
  h263dec: Disallow width/height changing with frame threads.

Conflicts:
Changelog
RELEASE
libavcodec/eatqi.c
libavcodec/h264_ps.c
libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/eatqi.c
libavcodec/h263dec.c
libavcodec/h264_ps.c
libavcodec/pngdec.c
libavcodec/qdm2.c
libavformat/electronicarts.c