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

Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed'

Browse Source 
* commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed':
  vc-1: Add platform-specific start code search routine to VC1DSPContext.

Conflicts:
	configure
	libavcodec/arm/vc1dsp_init_arm.c
	libavcodec/vc1dsp.c
	libavcodec/vc1dsp.h

See: 9d8ecdd8ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-05 12:59:02 +02:00
parent 77aafadc56 adf8227cf4
commit bf7ed956ff
7 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vc1_parser.c
View File

@@ -173,7 +173,7 @@ static int vc1_parse(AVCodecParserContext *s,
if (unesc_index >= UNESCAPED_THRESHOLD && !start_code_found) {
while (i < buf_size) {
if (search_state == NO_MATCH) {
i += vpc->v.vc1dsp.vc1_find_start_code_candidate(buf + i, buf_size - i);
i += vpc->v.vc1dsp.startcode_find_candidate(buf + i, buf_size - i);
if (i < buf_size) {
search_state = ONE_ZERO;
}