Merge commit '7e513d85e80d730718695d09fcaf0295ae24699e' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:02:33 +0000 (15:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:02:54 +0000 (15:02 +0200)
* commit '7e513d85e80d730718695d09fcaf0295ae24699e':
  h264: check that execute_decode_slices() is not called too many times

See: 64591f8f86f2dfeac13ee6b4e971d069675ca814
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c

@@@ -3920,6 -3833,12 +3920,8 @@@ static int execute_decode_slices(H264Co
      H264Context *hx;
      int i;
  
 -    if (s->mb_y >= s->mb_height) {
 -        av_log(s->avctx, AV_LOG_ERROR,
 -               "Input contains more MB rows than the frame height.\n");
 -        return AVERROR_INVALIDDATA;
 -    }
++    av_assert0(s->mb_y < s->mb_height);
      if (s->avctx->hwaccel ||
          s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
          return 0;