Make MPC demuxer deal with ID3 tags at the beginning

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7392 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index 1c941d8159eef2b4e0f6f5fe865048905017795e..f06cba762985c9eaeb947a13655ecf9cc8609685 100644 (file)
--- a/libavformat/mpc.c
+++ b/libavformat/mpc.c
@@ -45,6 +45,8 @@ static int mpc_probe(AVProbeData *p)
         return 0;
     if (d[0] == 'M' && d[1] == 'P' && d[2] == '+' && (d[3] == 0x17 || d[3] == 0x7))
         return AVPROBE_SCORE_MAX;
+    if (d[0] == 'I' && d[1] == 'D' && d[2] == '3')
+        return AVPROBE_SCORE_MAX / 2;
     return 0;
 }
 
@@ -52,10 +54,26 @@ static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
     MPCContext *c = s->priv_data;
     AVStream *st;
+    int t;
 
-    if(get_le24(&s->pb) != MKTAG('M', 'P', '+', 0)){
-        av_log(s, AV_LOG_ERROR, "Not a Musepack file\n");
-        return -1;
+    t = get_le24(&s->pb);
+    if(t != MKTAG('M', 'P', '+', 0)){
+        if(t != MKTAG('I', 'D', '3', 0)){
+            av_log(s, AV_LOG_ERROR, "Not a Musepack file\n");
+            return -1;
+        }
+        /* skip ID3 tags and try again */
+        url_fskip(&s->pb, 3);
+        t  = get_byte(&s->pb) << 21;
+        t |= get_byte(&s->pb) << 14;
+        t |= get_byte(&s->pb) <<  7;
+        t |= get_byte(&s->pb);
+        av_log(s, AV_LOG_DEBUG, "Skipping %d(%X) bytes of ID3 data\n", t, t);
+        url_fskip(&s->pb, t);
+        if(get_le24(&s->pb) != MKTAG('M', 'P', '+', 0)){
+            av_log(s, AV_LOG_ERROR, "Not a Musepack file\n");
+            return -1;
+        }
     }
     c->ver = get_byte(&s->pb);
     if(c->ver != 0x07 && c->ver != 0x17){