aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-12-25 22:46:39 +0100
committerAnton Khirnov <anton@khirnov.net>2014-12-27 10:44:48 +0100
commit60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3 (patch)
treef7cab7d42ed0f2151ebbb66b6d2ec8079884f5b4 /libavcodec
parent737d35e33408263c04d7730f5487eed0d04938ba (diff)
downloadffmpeg-60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3.tar.gz
h264: restore a block mistakenly removed in e10fd08a
CC: libav-stable@libav.org Bug-ID: 781
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 67c7eef1b5..b902422b2b 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1456,6 +1456,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];