virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'

Browse Source 
* commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9':
  h264dec: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-21 11:09:38 +02:00
parent f35b2fa8c9 01f111bdb2
commit de493809f3
1 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/h264dec.c
View File

@@ -33,14 +33,14 @@ static int h264_probe(AVProbeData *p)
if ((code & 0xffffff00) == 0x100) { if ((code & 0xffffff00) == 0x100) {
int ref_idc = (code >> 5) & 3; int ref_idc = (code >> 5) & 3;
int type = code & 0x1F; int type = code & 0x1F;
static const int8_t ref_zero[32]={ static const int8_t ref_zero[] = {
2, 0, 0, 0, 0, -1, 1, -1, 2, 0, 0, 0, 0, -1, 1, -1,
-1, 1, 1, 1, 1, -1, 2, 2, -1, 1, 1, 1, 1, -1, 2, 2,
2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2 2, 2, 2, 2, 2, 2, 2, 2
}; };
if(code & 0x80) //forbidden bit if (code & 0x80) // forbidden_bit
return 0; return 0;
if (ref_zero[type] == 1 && ref_idc) if (ref_zero[type] == 1 && ref_idc)
@@ -51,19 +51,27 @@ static int h264_probe(AVProbeData *p)
res++; res++;
switch (type) { switch (type) {
case 1: sli++; break; case 1:
case 5: idr++; break; sli++;
break;
case 5:
idr++;
break;
case 7: case 7:
if (p->buf[i + 2] & 0x03) if (p->buf[i + 2] & 0x03)
return 0; return 0;
sps++; sps++;
break; break;
case 8: pps++; break; case 8:
pps++;
break;
} }
} }
} }
if (sps && pps && (idr || sli > 3) && res < (sps + pps + idr)) if (sps && pps && (idr || sli > 3) && res < (sps + pps + idr))
return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg
return 0; return 0;
} }