RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 21:45:10 +00:00
Code Issues Projects Releases Wiki Activity

avformat/mpegvideodec: check seq headers more completely during probing

Browse Source 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-07 18:39:23 +01:00
parent 3bcd5c1e31
commit 3836af4765
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/mpegvideodec.c
View File

@ -23,6 +23,8 @@
#include "avformat.h"
#include "rawdec.h"
#include "libavutil/intreadwrite.h"
#define SEQ_START_CODE 0x000001b3
#define GOP_START_CODE 0x000001b8
#define PICTURE_START_CODE 0x00000100
@ -35,14 +37,29 @@ static int mpegvideo_probe(AVProbeData *p)
{
uint32_t code= -1;
int pic=0, seq=0, slice=0, pspack=0, vpes=0, apes=0, res=0, sicle=0;
int i;
int i, j;
uint32_t last = 0;
for(i=0; i<p->buf_size; i++){
code = (code<<8) + p->buf[i];
if ((code & 0xffffff00) == 0x100) {
switch(code){
case SEQ_START_CODE: seq++; break;
case SEQ_START_CODE:
if (!(p->buf[i+1+3+1+2] & 0x20))
break;
j = i;
if (p->buf[j+8] & 2)
j+= 64;
if (j >= p->buf_size)
break;
if (p->buf[j+8] & 1)
j+= 64;
if (j >= p->buf_size)
break;
if (AV_RB24(p->buf + j + 9) & 0xFFFFFE)
break;
seq++;
break;
case PICTURE_START_CODE: pic++; break;
case PACK_START_CODE: pspack++; break;
case 0x1b6: