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/tta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/tta.c') diff --git a/libavformat/tta.c b/libavformat/tta.c index 66d3bad904..628932da0c 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -32,7 +32,7 @@ static int tta_probe(AVProbeData *p) { const uint8_t *d = p->buf; - if (ff_id3v2_match(d)) + if (ff_id3v2_match(d, ID3v2_DEFAULT_MAGIC)) d += ff_id3v2_tag_len(d); if (d - p->buf >= p->buf_size) @@ -50,7 +50,7 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap) int i, channels, bps, samplerate, datalen, framelen; uint64_t framepos, start_offset; - ff_id3v2_read(s); + ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC); if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) ff_id3v1_read(s); -- cgit v1.2.3