highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/h264dec: Fix detection of invalid h264 with 0x100 startcodes

Browse Source 
Fies Ticket4325

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-30 03:53:32 +02:00
parent 2e15f07cfd
commit dae89802a6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/h264dec.c
View File

@ -47,8 +47,10 @@ static int h264_probe(AVProbeData *p)
return 0; return 0;
if (ref_zero[type] == -1 && !ref_idc) if (ref_zero[type] == -1 && !ref_idc)
return 0; return 0;
if (ref_zero[type] == 2) if (ref_zero[type] == 2) {
res++; if (!(code == 0x100 && !p->buf[i + 1] && !p->buf[i + 2]))
res++;
}
switch (type) { switch (type) {
case 1: case 1: