diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-03-25 16:12:51 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-05-04 21:43:06 +0200 |
| commit | e0f8be6413b6a8d334d6052e610af32935c310af (patch) | |
| tree | 1548e782ae23ad6e46225593b96928a85d1286a5 /libavformat/mpeg.c | |
| parent | 4d7ed3e73541983459a7913c2034eba69ebc113d (diff) | |
| download | ffmpeg-e0f8be6413b6a8d334d6052e610af32935c310af.tar.gz | |
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
Diffstat (limited to 'libavformat/mpeg.c')
| -rw-r--r-- | libavformat/mpeg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 2d08b17682..8a4c6d7acc 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -82,14 +82,14 @@ static int mpegps_probe(AVProbeData *p) } if(vid+audio > invalid) /* invalid VDR files nd short PES streams */ - score= AVPROBE_SCORE_MAX/4; + score = AVPROBE_SCORE_EXTENSION / 2; if(sys>invalid && sys*9 <= pspack*10) - return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg + return pspack > 2 ? AVPROBE_SCORE_EXTENSION + 2 : AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9) - return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg + return pspack > 2 ? AVPROBE_SCORE_EXTENSION + 2 : AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048 && vid + audio > invalid) /* PES stream */ - return (audio > 12 || vid > 3) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; + return (audio > 12 || vid > 3) ? AVPROBE_SCORE_EXTENSION + 2 : AVPROBE_SCORE_EXTENSION / 2; //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1 //mp3_misidentified_2.mp3 has sys:0 priv1:0 pspack:0 vid:0 audio:6 |