generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e'

Browse Source 
* commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e':
  vc1: Fix the skip condition

Conflicts:
	libavcodec/vc1_parser.c

See: ede411dd03950b91c6346f2a3ae0e7546555f42f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-26 12:40:32 +02:00
commit ba650ea118
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vc1_parser.c
View File

@ -127,6 +127,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;
@ -137,8 +138,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;