aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-04-15 13:50:02 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-04-15 13:50:02 +0000
commit4b3cca363078a6ca489a74c837481279608146eb (patch)
treea180c4327597ae83dc733d766e942f667449598e /libavformat/utils.c
parent056f6b8f0928df2fb114c8a09775232044c52d99 (diff)
downloadffmpeg-4b3cca363078a6ca489a74c837481279608146eb.tar.gz
Do not detect a format if another has the same score.
Originally committed as revision 12837 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index dad210499e..55b9fba0c0 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -282,7 +282,8 @@ static AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int
if (score > *score_max) {
*score_max = score;
fmt = fmt1;
- }
+ }else if (score == *score_max)
+ fmt = NULL;
}
return fmt;
}