diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 16:39:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 16:39:38 +0100 |
| commit | 64591f8f86f2dfeac13ee6b4e971d069675ca814 (patch) | |
| tree | 8ae40fc799b7a0e5063d76cb2056cdee37239d24 /libavcodec/h264.c | |
| parent | a60abb1ee01ee065fc1ab2a784fefbd5d3c94917 (diff) | |
| parent | 9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf (diff) | |
| download | ffmpeg-64591f8f86f2dfeac13ee6b4e971d069675ca814.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>
Diffstat (limited to 'libavcodec/h264.c')
| -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 dfa2f8d25a..8366cdcf11 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4675,6 +4675,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; |