Merge commit '993977032a0adb47eb70e7fef6ce0d5370027e83' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 21:31:18 +0000 (22:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 21:31:18 +0000 (22:31 +0100)
commit76c48a78d1c0842d26b8ae926af3610935b0f280
tree66f9c2fb0840ac526bd0f135ea4cf166e5c84d14
parent6c0c799bd5869b3baccb57012d69490a0b35c62b
parent993977032a0adb47eb70e7fef6ce0d5370027e83
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>
libavcodec/pcx.c
libavcodec/pngdec.c
libavcodec/xan.c
libavformat/bfi.c
libavformat/mov.c