[FFmpeg-cvslog] lavf: minor cleanup of av_probe_input_format3()

Michael Niedermayer git at videolan.org
Wed Nov 23 22:18:03 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 23 21:55:25 2011 +0100| [6a3a54f5e382bd06e9097fe4094fb623c76cc2dd] | committer: Michael Niedermayer

lavf: minor cleanup of av_probe_input_format3()

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

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

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 35d85cb..b7386ed 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -326,8 +326,8 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score
         score = 0;
         if (fmt1->read_probe) {
             score = fmt1->read_probe(&lpd);
-            if(!score && fmt1->extensions && av_match_ext(lpd.filename, fmt1->extensions))
-                score = 1;
+            if(fmt1->extensions && av_match_ext(lpd.filename, fmt1->extensions))
+                score = FFMAX(score, 1);
         } else if (fmt1->extensions) {
             if (av_match_ext(lpd.filename, fmt1->extensions)) {
                 score = 50;



More information about the ffmpeg-cvslog mailing list