From c6cd525aa0b88a593ccb8c492f9a6a0a5c8abc86 Mon Sep 17 00:00:00 2001 From: Vladimir Voroshilov Date: Sat, 19 Apr 2008 14:52:19 +0000 Subject: Decrease returning probe score for WAV demuxer to avoid probe conflict between WAV and future ACT demuxer. This is necessary because ACT has standard WAV header at top of it's own. Originally committed as revision 12909 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/wav.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libavformat/wav.c') 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; } -- cgit v1.2.3