diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-12-25 22:46:39 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-12-27 11:07:45 +0100 |
| commit | 883795fb0face00a07349fbd32f4775431a9f30d (patch) | |
| tree | 86e81903acfafa4552291850e57d3c182c7d8580 | |
| parent | 48952116352ab03565cc14805e0f1d63cf0318fe (diff) | |
| download | ffmpeg-883795fb0face00a07349fbd32f4775431a9f30d.tar.gz | |
h264: restore a block mistakenly removed in e10fd08a
CC: libav-stable@libav.org
Bug-ID: 781
(cherry picked from commit 60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -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 562b1023e3..4bc0a03c24 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1454,6 +1454,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, buf_index = find_start_code(buf, buf_size, buf_index, next_avc); if (buf_index >= buf_size) break; + if (buf_index >= next_avc) + continue; } hx = h->thread_context[context_count]; |