Merge commit 'b0ca5fef09d1b1268ea0c8f89bf53cd38aaa85e7' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 22:18:12 +0000 (00:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 22:18:12 +0000 (00:18 +0200)
commitc8ca38567669278dde3a50d2d7e4fa2f831ef044
treed87070f53eeaa55bd2b6989b1e0c8bff41f41cec
parentc6a4397410ab5f1b22cbc9f1ccb3126b3e5d6125
parentb0ca5fef09d1b1268ea0c8f89bf53cd38aaa85e7
Merge commit 'b0ca5fef09d1b1268ea0c8f89bf53cd38aaa85e7' into release/0.10

* commit 'b0ca5fef09d1b1268ea0c8f89bf53cd38aaa85e7':
  dv: Add a guard to not overread the ppcm array
  mpegvideo: Avoid 32-bit wrapping of linesize multiplications
  mjpegb: Detect changing number of planes in interlaced video
  matroskadec: Check that .lang was allocated and set before reading it
  ape demuxer: check for EOF in potentially long loops
  lavf: avoid integer overflow when estimating bitrate
  pictordec: break out of both decoding loops when y drops below 0
  ac3: Return proper error codes

Conflicts:
libavcodec/pictordec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dec.c
libavcodec/mjpegdec.c
libavcodec/mpegvideo_common.h
libavcodec/pictordec.c
libavformat/ape.c
libavformat/dv.c
libavformat/matroskadec.c
libavformat/utils.c