commit e0f8be6413b6a8d334d6052e610af32935c310af
author Diego Biurrun <diego@biurrun.de> Mon Mar 25 15:12:51 2013
committer Diego Biurrun <diego@biurrun.de> Sat May 04 19:43:06 2013
tree 1548e782ae23ad6e46225593b96928a85d1286a5
parent 4d7ed3e73541983459a7913c2034eba69ebc113d

avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate

libavformat/mpeg.c

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 2d08b17..8a4c6d7 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -82,14 +82,14 @@
     }
 
     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