Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 00:11:31 +0000 (02:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 00:11:31 +0000 (02:11 +0200)
commit653cdf42ee90d11b96c364c7fe627072e33abf32
treef4b484b0e164331d27e5156ce5087583a97b2131
parent829e43017fa733479a72e6518bb9c1f0da441dc5
parenta9fc88ea93b2648e043a2bb863cfacabc8c3342d
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  Prepare for 9.10 RELEASE
  h263dec: Remove a hack that can cause infinite loops
  mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0
  vc1dec: Don't decode slices when the latest slice header failed to decode

Conflicts:
RELEASE
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/vc1dec.c