har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  h264_parser: use enum values in h264_find_frame_end()

Conflicts:
	libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-15 21:05:31 +01:00
commit f3a862935d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/h264_parser.c
View File

@ -76,13 +76,15 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf,
else else
state >>= 1; // 2->1, 1->0, 0->0 state >>= 1; // 2->1, 1->0, 0->0
} else if (state <= 5) { } else if (state <= 5) {
int v = buf[i] & 0x1F; int nalu_type = buf[i] & 0x1F;
if (v == 6 || v == 7 || v == 8 || v == 9) { if (nalu_type == NAL_SEI || nalu_type == NAL_SPS ||
nalu_type == NAL_PPS || nalu_type == NAL_AUD) {
if (pc->frame_start_found) { if (pc->frame_start_found) {
i++; i++;
goto found; goto found;
} }
} else if (v == 1 || v == 2 || v == 5) { } else if (nalu_type == NAL_SLICE || nalu_type == NAL_DPA ||
nalu_type == NAL_IDR_SLICE) {
state += 8; state += 8;
continue; continue;
} }