summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-05 23:28:52 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-05 23:28:52 +0000
commita6b8c576fd8f10af978da6164022fdbbca4dd200 (patch)
treee94eb819c31484f99d878c7580f9f20b4a5f62d1 /libmpdemux
parent6eebee1070891cff0ebdcc657ce82a0d01a3c6d0 (diff)
downloadmpv-a6b8c576fd8f10af978da6164022fdbbca4dd200.tar.bz2
mpv-a6b8c576fd8f10af978da6164022fdbbca4dd200.tar.xz
skip id3v2 junk when looking for mp3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8117 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_audio.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 2f3ffc7d3f..c0480b3af4 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -65,6 +65,13 @@ int demux_audio_open(demuxer_t* demuxer) {
// We found wav header. Now we can have 'fmt ' or a mp3 header
// empty the buffer
step = 4;
+ } else if( hdr[0] == 'I' && hdr[1] == 'D' && hdr[2] == '3' && (hdr[3] >= 2)) {
+ int len;
+ stream_skip(s,2);
+ stream_read(s,hdr,4);
+ len = (hdr[0]<<21) | (hdr[1]<<14) | (hdr[2]<<7) | hdr[3];
+ stream_skip(s,len);
+ step = 4;
} else if( hdr[0] == 'f' && hdr[1] == 'm' && hdr[2] == 't' && hdr[3] == ' ' ) {
frmt = WAV;
break;