Merge commit '68a1df13c460adb6241cfdf96aad953b5d637623' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 20:33:44 +0000 (21:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 20:33:44 +0000 (21:33 +0100)
commit9e96051d5d03c13692090bff5c804fa5aaa11375
tree52de7c663d6e1a57cb9814634e3abda648520eeb
parent85c02da3076893dc09fe25152754ae072b59a837
parent68a1df13c460adb6241cfdf96aad953b5d637623
Merge commit '68a1df13c460adb6241cfdf96aad953b5d637623' into release/0.10

* commit '68a1df13c460adb6241cfdf96aad953b5d637623':
  smacker: Avoid integer overflow when allocating packets
  smacker: Don't return packets in unallocated streams
  dsicin: Add some basic sanity checks for fields read from the file
  arm: Don't clobber callee saved registers in scalarproduct
  Prepare for 0.8.10 Release
  roqvideodec: check dimensions validity
  qdm2: check array index before use, fix out of array accesses
  alsdec: check block length

Conflicts:
RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/alsdec.c
libavcodec/qdm2.c
libavcodec/roqvideodec.c
libavformat/dsicin.c
libavformat/smacker.c