[SCM] libav/experimental: Make MPC demuxer deal with ID3 tags at the beginning
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:54:34 UTC 2013
The following commit has been merged in the experimental branch:
commit 0587b0cacde5d65f0edd9e5e4509fbdb21dfe37f
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date: Mon Jan 1 05:29:53 2007 +0000
Make MPC demuxer deal with ID3 tags at the beginning
Originally committed as revision 7392 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index 1c941d8..f06cba7 100644
--- 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){
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list