aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-03-25 16:14:55 +0100
committerDiego Biurrun <diego@biurrun.de>2013-05-04 21:51:00 +0200
commita8a45dfe25ec63f23676258a11e57b312a794d4c (patch)
treee5eb2dca0be6eef389ad0d20e3659207e001c9f6 /libavformat
parente0f8be6413b6a8d334d6052e610af32935c310af (diff)
downloadffmpeg-a8a45dfe25ec63f23676258a11e57b312a794d4c.tar.gz
avs: Increase magic value score above file extension score
This should fix misdetection of AVS files as AviSynth scripts when AviSynth support is enabled (Bugzilla #357).
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avs.c b/libavformat/avs.c
index b96a122c13..3e95a3656a 100644
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -50,7 +50,9 @@ static int avs_probe(AVProbeData * p)
d = p->buf;
if (d[0] == 'w' && d[1] == 'W' && d[2] == 0x10 && d[3] == 0)
- return AVPROBE_SCORE_EXTENSION;
+ /* Ensure the buffer probe scores higher than the extension probe.
+ * This avoids problems with misdetection as AviSynth scripts. */
+ return AVPROBE_SCORE_EXTENSION + 1;
return 0;
}