Mercurial > libavformat.hg

diff tta.c @ 6121:81614e9b541b libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author cehoyos
date Fri, 11 Jun 2010 13:44:57 +0000
parents 536e5527c1e0
children
line wrap: on
line diff
--- a/tta.c	Fri Jun 11 13:28:42 2010 +0000
+++ b/tta.c	Fri Jun 11 13:44:57 2010 +0000
@@ -32,7 +32,7 @@
 {
     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 @@
     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);