Decrease returning probe score for WAV demuxer to avoid
authorVladimir Voroshilov <voroshil@gmail.com>
Sat, 19 Apr 2008 14:52:19 +0000 (14:52 +0000)
committerVladimir Voroshilov <voroshil@gmail.com>
Sat, 19 Apr 2008 14:52:19 +0000 (14:52 +0000)
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

index 5053d15..ffcc4ac 100644 (file)
@@ -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;
 }