[FFmpeg-cvslog] Merge commit '993977032a0adb47eb70e7fef6ce0d5370027e83' into release/0.10
Michael Niedermayer
git at videolan.org
Thu Jan 16 22:36:40 CET 2014
ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 16 22:31:18 2014 +0100| [76c48a78d1c0842d26b8ae926af3610935b0f280] | committer: Michael Niedermayer
Merge commit '993977032a0adb47eb70e7fef6ce0d5370027e83' into release/0.10
* commit '993977032a0adb47eb70e7fef6ce0d5370027e83':
xan: Use bytestream2 to limit reading to within the buffer
pcx: Consume the whole packet if giving up due to missing palette
pngdec: Stop trying to decode once inflate returns Z_STREAM_END
mov: Make sure the read sample count is nonnegative
bfi: Add some very basic sanity checks for input packet sizes
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76c48a78d1c0842d26b8ae926af3610935b0f280
---
More information about the ffmpeg-cvslog
mailing list