diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 16:39:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 16:42:32 +0100 |
| commit | 9e8464e81bfe4e5f2f789330f3584e2d0706e29f (patch) | |
| tree | f7ddc9260ce7c39aa69b1965c9b15ecac4531788 | |
| parent | c9a8dfa5ae162d719f554915af7bf0c9f918c943 (diff) | |
| download | ffmpeg-9e8464e81bfe4e5f2f789330f3584e2d0706e29f.tar.gz | |
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>
(cherry picked from commit 64591f8f86f2dfeac13ee6b4e971d069675ca814)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1d2570be56..76a82acafb 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; |