generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2014-01-06 16:39:38 +01:00
commit 64591f8f86
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -4675,6 +4675,8 @@ static int execute_decode_slices(H264Context *h, int context_count)
H264Context *hx; H264Context *hx;
int i; int i;
av_assert0(h->mb_y < h->mb_height);
if (h->avctx->hwaccel || if (h->avctx->hwaccel ||
h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
return 0; return 0;