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)
* 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>
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc libavcodec/xl.c
Simple merge
Simple merge