aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-08-24 19:34:13 +0200
committerLuca Barbato <lu_zero@gentoo.org>2014-08-26 03:43:13 +0200
commita4d3c20035946cbc1509aec2dc28d51c2a2f9a8e (patch)
tree7529938c6428b75faa1114ed604715e8eba2045d /libavcodec
parentab56fabe6294524e99815451ad01e4ff50c6d734 (diff)
downloadffmpeg-a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e.tar.gz
vc1: Fix the skip condition
As written in the comment above, skip must be added only if a start code is found.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vc1_parser.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c
index 43ca0ede87..a6532820d1 100644
--- a/libavcodec/vc1_parser.c
+++ b/libavcodec/vc1_parser.c
@@ -123,6 +123,7 @@ static int vc1_parse(AVCodecParserContext *s,
uint8_t *unesc_buffer = vpc->unesc_buffer;
size_t unesc_index = vpc->unesc_index;
VC1ParseSearchState search_state = vpc->search_state;
+ int start_code_found;
int next = END_NOT_FOUND;
int i = vpc->bytes_to_skip;
@@ -133,8 +134,8 @@ static int vc1_parse(AVCodecParserContext *s,
next = 0;
}
while (i < buf_size) {
- int start_code_found = 0;
uint8_t b;
+ start_code_found = 0;
while (i < buf_size && unesc_index < UNESCAPED_THRESHOLD) {
b = buf[i++];
unesc_buffer[unesc_index++] = b;
@@ -232,7 +233,7 @@ static int vc1_parse(AVCodecParserContext *s,
* the start code we've already seen, or cause extra bytes to be
* inserted at the start of the unescaped buffer. */
vpc->bytes_to_skip = 4;
- if (next < 0)
+ if (next < 0 && start_code_found)
vpc->bytes_to_skip += next;
*poutbuf = buf;