Commit c6cd525a authored by Vladimir Voroshilov's avatar Vladimir Voroshilov

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
parent bebfc16a
...@@ -145,7 +145,12 @@ static int wav_probe(AVProbeData *p) ...@@ -145,7 +145,12 @@ static int wav_probe(AVProbeData *p)
p->buf[2] == 'F' && p->buf[3] == 'F' && p->buf[2] == 'F' && p->buf[3] == 'F' &&
p->buf[8] == 'W' && p->buf[9] == 'A' && p->buf[8] == 'W' && p->buf[9] == 'A' &&
p->buf[10] == 'V' && p->buf[11] == 'E') 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 else
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment