[FFmpeg-cvslog] mpegvideo_probe: reduce score for invalid streams

Michael Niedermayer git at videolan.org
Wed Nov 9 00:18:44 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  8 22:24:55 2011 +0100| [bf0ac7aa696237a9a3834ac6c065462786770e54] | committer: Michael Niedermayer

mpegvideo_probe: reduce score for invalid streams

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf0ac7aa696237a9a3834ac6c065462786770e54
---

 libavformat/mpegvideodec.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c
index 1b724bc..11e4bd7 100644
--- a/libavformat/mpegvideodec.c
+++ b/libavformat/mpegvideodec.c
@@ -51,7 +51,8 @@ static int mpegvideo_probe(AVProbeData *p)
         }
     }
     if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !apes)
-        return (pic>1 && !vpes) ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
+        if(vpes) return AVPROBE_SCORE_MAX/8;
+        else     return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list