[FFmpeg-cvslog] probe: Restore identification of files with very large id3 tags and no extension.

Alex Converse git at videolan.org
Sat Oct 29 02:31:43 CEST 2011


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Tue Oct 25 18:37:24 2011 -0700| [61856d06eb30955290911140e6745bad93a25323] | committer: Alex Converse

probe: Restore identification of files with very large id3 tags and no extension.

Restore behavior of identifying files with huge id3 tags as
mp3 at AVPROBE_SCORE_MAX/4. This was broken in r25378 and subsequently
removed in r25929.

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

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 20be871..81eee97 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -347,6 +347,14 @@ AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score
             }
     }
 
+    if (!fmt && id3 && *score_max < AVPROBE_SCORE_MAX/4-1) {
+        while ((fmt = av_iformat_next(fmt)))
+            if (fmt->extensions && av_match_ext("mp3", fmt->extensions)) {
+                *score_max = AVPROBE_SCORE_MAX/4-1;
+                break;
+            }
+    }
+
     return fmt;
 }
 



More information about the ffmpeg-cvslog mailing list