RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve h263_probe() 

Fixes issue2015

Originally committed as revision 23645 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-06-18 23:17:20 +00:00
parent 164aab02a0
commit 57eb217ac4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/raw.c
View File

@ -457,6 +457,7 @@ static int h263_probe(AVProbeData *p)
int invalid_psc=0; int invalid_psc=0;
int res_change=0; int res_change=0;
int src_fmt, last_src_fmt=-1; int src_fmt, last_src_fmt=-1;
int last_gn=0;
for(i=0; i<p->buf_size; i++){ for(i=0; i<p->buf_size; i++){
code = (code<<8) + p->buf[i]; code = (code<<8) + p->buf[i];
@ -469,9 +470,16 @@ static int h263_probe(AVProbeData *p)
if((code&0x300)==0x200 && src_fmt){ if((code&0x300)==0x200 && src_fmt){
valid_psc++; valid_psc++;
last_gn=0;
}else }else
invalid_psc++; invalid_psc++;
last_src_fmt= src_fmt; last_src_fmt= src_fmt;
} else if((code & 0xffff800000) == 0x800000) {
int gn= (code>>(23-5)) & 0x1F;
if(gn<last_gn){
invalid_psc++;
}else
last_gn= gn;
} }
} }
//av_log(NULL, AV_LOG_ERROR, "h263_probe: psc:%d invalid:%d res_change:%d\n", valid_psc, invalid_psc, res_change); //av_log(NULL, AV_LOG_ERROR, "h263_probe: psc:%d invalid:%d res_change:%d\n", valid_psc, invalid_psc, res_change);