[FFmpeg-cvslog] r12909 - trunk/libavformat/wav.c

voroshil subversion
Sat Apr 19 16:52:19 CEST 2008


Author: voroshil
Date: Sat Apr 19 16:52:19 2008
New Revision: 12909

Log:
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.


Modified:
   trunk/libavformat/wav.c

Modified: trunk/libavformat/wav.c
==============================================================================
--- trunk/libavformat/wav.c	(original)
+++ trunk/libavformat/wav.c	Sat Apr 19 16:52:19 2008
@@ -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;
 }




More information about the ffmpeg-cvslog mailing list