[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/9' into release/1.1
Michael Niedermayer
git at videolan.org
Tue Oct 8 02:16:59 CEST 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 8 02:11:31 2013 +0200| [653cdf42ee90d11b96c364c7fe627072e33abf32] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=653cdf42ee90d11b96c364c7fe627072e33abf32
---
More information about the ffmpeg-cvslog
mailing list