- int t, ret;
- int64_t pos = url_ftell(s->pb);
-
- t = get_le24(s->pb);
- if(t != MKTAG('M', 'P', '+', 0)){
- uint8_t buf[ID3v2_HEADER_SIZE];
- if (url_fseek(s->pb, pos, SEEK_SET) < 0)
- return -1;
- ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE);
- if (ret != ID3v2_HEADER_SIZE || !ff_id3v2_match(buf, ID3v2_DEFAULT_MAGIC)) {
- av_log(s, AV_LOG_ERROR, "Not a Musepack file\n");
- return -1;
- }
- /* skip ID3 tags and try again */
- t = ff_id3v2_tag_len(buf) - ID3v2_HEADER_SIZE;
- 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;
- }
- /* read ID3 tags */
- if (url_fseek(s->pb, pos, SEEK_SET) < 0)
- return -1;
- ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC);
- get_le24(s->pb);
+
+ if(avio_rl24(s->pb) != MKTAG('M', 'P', '+', 0)){
+ av_log(s, AV_LOG_ERROR, "Not a Musepack file\n");
+ return AVERROR_INVALIDDATA;