summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-21 16:07:37 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-21 16:07:37 +0000
commitefeb534cc8877d9a0d5390a6fe4e5814e9dc9b6d (patch)
treee6a0b6530a7acd0795fbc3f87ec9d8debad0a721 /libmpdemux
parent54a37343325d74354a8f1ce1ea2bcd2b1c058985 (diff)
downloadmpv-efeb534cc8877d9a0d5390a6fe4e5814e9dc9b6d.tar.bz2
mpv-efeb534cc8877d9a0d5390a6fe4e5814e9dc9b6d.tar.xz
Continue detection if it is not clear if we have a MP3 or flac file.
Fixes http://samples.mplayerhq.hu/A-codecs/MP3/01%20-%20Charity%20Case.mp3 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26844 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_audio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 032c739fc6..d1717c791e 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -293,7 +293,8 @@ static int demux_audio_open(demuxer_t* demuxer) {
}
} else if( hdr[0] == 'f' && hdr[1] == 'L' && hdr[2] == 'a' && hdr[3] == 'C' ) {
frmt = fLaC;
- break;
+ if (!mp3_hdrs || mp3_hdrs->cons_hdrs < 3)
+ break;
}
// Add here some other audio format detection
if(step < HDR_SIZE)