diff options
author | Vladimir Voroshilov <voroshil@gmail.com> | 2008-04-19 14:52:19 +0000 |
---|---|---|
committer | Vladimir Voroshilov <voroshil@gmail.com> | 2008-04-19 14:52:19 +0000 |
commit | c6cd525aa0b88a593ccb8c492f9a6a0a5c8abc86 (patch) | |
tree | fd5c1f9af93ed0b308e00a7fb65beb209b0e7e61 | |
parent | bebfc16a31c34de59e97ebc5bd58c7c31c4b191c (diff) | |
download | ffmpeg-c6cd525aa0b88a593ccb8c492f9a6a0a5c8abc86.tar.gz |
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
-rw-r--r-- | libavformat/wav.c | 7 |
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; } |