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

Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'

Browse Source 
* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8':
  h264: Move start code search functions into separate source files.

Conflicts:
	libavcodec/arm/Makefile
	libavcodec/arm/h264dsp_init_arm.c
	libavcodec/h264_parser.c
	libavcodec/h264dsp.c
	libavcodec/startcode.c
	libavcodec/startcode.h

See: 270cede3f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-05 12:45:30 +02:00
parent de417982e8 db7f1c7c5a
commit 77aafadc56
10 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_parser.c
View File

@@ -66,7 +66,7 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf,
}
if (state == 7) {
i += h->h264dsp.h264_find_start_code_candidate(buf + i, next_avc - i);
i += h->h264dsp.startcode_find_candidate(buf + i, next_avc - i);
if (i < next_avc)
state = 2;
} else if (state <= 2) {