From 3a1350e8d9955a5eb9ec90f9b3e27ae63c3fb0bb Mon Sep 17 00:00:00 2001 From: Michael Karcher Date: Fri, 11 Jun 2010 13:44:57 +0000 Subject: Generalize ID3v2 functions to support ID3v2-like ID headers with a different magic in the header (mainly targeted to Sony's .oma/.aa3 format). Patch by Michael Karcher, ffmpeg A mkarcher dialup fu-berlin de Originally committed as revision 23583 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/raw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/raw.c') diff --git a/libavformat/raw.c b/libavformat/raw.c index 85d204d7e3..0a188cf25c 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -664,7 +664,7 @@ static int adts_aac_probe(AVProbeData *p) uint8_t *buf; uint8_t *end = buf0 + p->buf_size - 7; - if (ff_id3v2_match(buf0)) { + if (ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC)) { buf0 += ff_id3v2_tag_len(buf0); } buf = buf0; @@ -706,7 +706,7 @@ static int adts_aac_read_header(AVFormatContext *s, st->need_parsing = AVSTREAM_PARSE_FULL; ff_id3v1_read(s); - ff_id3v2_read(s); + ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC); return 0; } -- cgit v1.2.3