projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a773d4
)
probe: Restore identification of files with very large id3 tags and no extension.
author
Alex Converse
<alex.converse@gmail.com>
Wed, 26 Oct 2011 01:37:24 +0000
(18:37 -0700)
committer
Alex Converse
<alex.converse@gmail.com>
Fri, 28 Oct 2011 22:44:10 +0000
(15:44 -0700)
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.
libavformat/utils.c
patch
|
blob
|
history
diff --git
a/libavformat/utils.c
b/libavformat/utils.c
index
20be871
..
81eee97
100644
(file)
--- 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;
}