diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-21 15:02:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-21 15:02:54 +0200 |
| commit | 58e2d529b3df2fda710d8ed684a7d2aafad9b5d0 (patch) | |
| tree | 9d14ed4a40a05b6279fcd193fad7e8086f24502e | |
| parent | b9550ea116174de22ec2a9911cfc92f0213e51ef (diff) | |
| parent | 7e513d85e80d730718695d09fcaf0295ae24699e (diff) | |
Merge commit '7e513d85e80d730718695d09fcaf0295ae24699e' into release/1.1
* commit '7e513d85e80d730718695d09fcaf0295ae24699e':
h264: check that execute_decode_slices() is not called too many times
See: 64591f8f86f2dfeac13ee6b4e971d069675ca814
Merged-by: Michael Niedermayer <[email protected]>
| -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 7d8697847d..74b10eeb3e 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3920,6 +3920,8 @@ static int execute_decode_slices(H264Context *h, int context_count) H264Context *hx; int i; + av_assert0(s->mb_y < s->mb_height); + if (s->avctx->hwaccel || s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) return 0; |