summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/wav.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/wav.c b/libavformat/wav.c
index 5053d15006..ffcc4ac6e5 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -145,7 +145,12 @@ static int wav_probe(AVProbeData *p)
p->buf[2] == 'F' && p->buf[3] == 'F' &&
p->buf[8] == 'W' && p->buf[9] == 'A' &&
p->buf[10] == 'V' && p->buf[11] == 'E')
- return AVPROBE_SCORE_MAX;
+ /*
+ Since ACT demuxer has standard WAV header at top of it's own,
+ returning score is decreased to avoid probe conflict
+ between ACT and WAV.
+ */
+ return AVPROBE_SCORE_MAX - 1;
else
return 0;
}