Merge commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf'

* commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf':
  h264: check that execute_decode_slices() is not called too many times

Conflicts:
	libavcodec/h264.c

The check is replaced by an assert() as the mb index should not ever go out
of bounds.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/h264.c
index dfa2f8d25a6b00e875b1df6455836414932edbf5,7d49d4877d7726811451d691210732ad853fc642..8366cdcf11faa3ad9a4a620d7dc4c7936c68224e
--- 1/libavcodec/h264.c
--- 2/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -4675,8 -4495,13 +4675,10 @@@ static int execute_decode_slices(H264Co
      H264Context *hx;
      int i;
  
 -    if (h->mb_y >= h->mb_height) {
 -        av_log(h->avctx, AV_LOG_ERROR,
 -               "Input contains more MB rows than the frame height.\n");
 -        return AVERROR_INVALIDDATA;
 -    }
++    av_assert0(h->mb_y < h->mb_height);
+ 
 -    if (h->avctx->hwaccel)
 +    if (h->avctx->hwaccel ||
 +        h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
          return 0;
      if (context_count == 1) {
          return decode_slice(avctx, &h);