virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vc1: Fix the skip condition

Browse Source 
As written in the comment above, skip must be added only if a
start code is found.
This commit is contained in:
Luca Barbato 2014-08-24 19:34:13 +02:00
parent ab56fabe62
commit a4d3c20035
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/vc1_parser.c
View File

@ -123,6 +123,7 @@ static int vc1_parse(AVCodecParserContext *s,
uint8_t *unesc_buffer = vpc->unesc_buffer; uint8_t *unesc_buffer = vpc->unesc_buffer;
size_t unesc_index = vpc->unesc_index; size_t unesc_index = vpc->unesc_index;
VC1ParseSearchState search_state = vpc->search_state; VC1ParseSearchState search_state = vpc->search_state;
int start_code_found;
int next = END_NOT_FOUND; int next = END_NOT_FOUND;
int i = vpc->bytes_to_skip; int i = vpc->bytes_to_skip;
@ -133,8 +134,8 @@ static int vc1_parse(AVCodecParserContext *s,
next = 0; next = 0;
} }
while (i < buf_size) { while (i < buf_size) {
int start_code_found = 0;
uint8_t b; uint8_t b;
start_code_found = 0;
while (i < buf_size && unesc_index < UNESCAPED_THRESHOLD) { while (i < buf_size && unesc_index < UNESCAPED_THRESHOLD) {
b = buf[i++]; b = buf[i++];
unesc_buffer[unesc_index++] = b; 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 * the start code we've already seen, or cause extra bytes to be
* inserted at the start of the unescaped buffer. */ * inserted at the start of the unescaped buffer. */
vpc->bytes_to_skip = 4; vpc->bytes_to_skip = 4;
if (next < 0) if (next < 0 && start_code_found)
vpc->bytes_to_skip += next; vpc->bytes_to_skip += next;
*poutbuf = buf; *poutbuf = buf;