Merge commit '54e03863691dcae73260f70108b3731b70773e7c' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 21:03:08 +0000 (23:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 21:03:08 +0000 (23:03 +0200)
commit210a437e105fbd92f1dd9c2c82f4a5efd80ca8fd
treecc8e853469bf8e2e26b08d086c11cd19132edcd4
parent3308b443f9342cd597a9d7440d2315f0a65b1566
parent54e03863691dcae73260f70108b3731b70773e7c
Merge commit '54e03863691dcae73260f70108b3731b70773e7c' into release/0.10

* commit '54e03863691dcae73260f70108b3731b70773e7c':
  vc1: check the source buffer in vc1_mc functions
  bink: Bound check the quantization matrix.
  xl: Make sure the width is valid
  alsdec: Fix the clipping range
  dsicinav: Bound-check the source buffer when needed
  mov: Do not allow updating the time scale after it has been set
  ac3dec: Don't consume more data than the actual input packet size
  indeo: Reject impossible FRAMETYPE_NULL

Conflicts:
libavcodec/alsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dec.c
libavcodec/alsdec.c
libavcodec/bink.c
libavcodec/dsicinav.c
libavcodec/ivi_common.c
libavcodec/vc1dec.c
libavcodec/xl.c
libavformat/mov.c