diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 22:31:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 22:31:18 +0100 |
| commit | 76c48a78d1c0842d26b8ae926af3610935b0f280 (patch) | |
| tree | 66f9c2fb0840ac526bd0f135ea4cf166e5c84d14 /libswresample | |
| parent | 6c0c799bd5869b3baccb57012d69490a0b35c62b (diff) | |
| parent | 993977032a0adb47eb70e7fef6ce0d5370027e83 (diff) | |
| download | ffmpeg-76c48a78d1c0842d26b8ae926af3610935b0f280.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions