virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

fix probing of 02-Penguin.flac

Browse Source 
= a single startcode should not override extension based detection

Originally committed as revision 6025 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-08-19 08:39:00 +00:00
parent 652c59b967
commit a1c69e0b50
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/mpeg.c
View File

@ -1265,6 +1265,7 @@ static int mpegps_probe(AVProbeData *p)
uint32_t code= -1; uint32_t code= -1;
int sys=0, pspack=0, priv1=0, vid=0, audio=0; int sys=0, pspack=0, priv1=0, vid=0, audio=0;
int i; int i;
int score=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];
@ -1276,15 +1277,20 @@ static int mpegps_probe(AVProbeData *p)
else if((code & 0xe0) == AUDIO_ID) audio++; else if((code & 0xe0) == AUDIO_ID) audio++;
} }
} }
if(vid || audio) /* invalid VDR files nd short PES streams */
score= AVPROBE_SCORE_MAX/4;
//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d\n", sys, priv1, pspack,vid, audio);
if(sys && sys*9 <= pspack*10) if(sys && sys*9 <= pspack*10)
return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
if((priv1 || vid || audio) && (priv1+vid+audio)*9 <= pspack*10) if((priv1 || vid || audio) && (priv1+vid+audio)*9 <= pspack*10)
return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
if((!!vid ^ !!audio) && !sys && !pspack) /* PES stream */ if((!!vid ^ !!audio) && (audio+vid > 1) && !sys && !pspack) /* PES stream */
return AVPROBE_SCORE_MAX/2+2; return AVPROBE_SCORE_MAX/2+2;
if(vid || audio) /* invalid VDR files */
return AVPROBE_SCORE_MAX/2+2; //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1
return 0; return score;
} }