[FFmpeg-cvslog] Merge commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf'

[Michael Niedermayer]

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 16:39:38 2014 +0100| [9e8464e81bfe4e5f2f789330f3584e2d0706e29f] | committer: Michael Niedermayer

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 at gmx.at>
(cherry picked from commit 64591f8f86f2dfeac13ee6b4e971d069675ca814)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e8464e81bfe4e5f2f789330f3584e2d0706e29f
---

 libavcodec/h264.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 1d2570b..76a82ac 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4605,6 +4605,8 @@ static int execute_decode_slices(H264Context *h, int context_count)
     H264Context *hx;
     int i;
 
+    av_assert0(h->mb_y < h->mb_height);
+
     if (h->avctx->hwaccel ||
         h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
         return 0;