Mercurial > libavformat.hg

diff raw.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 a2a55244ca6b
children f2c92e715300
line wrap: on
line diff
--- a/raw.c	Fri Jun 11 13:28:42 2010 +0000
+++ b/raw.c	Fri Jun 11 13:44:57 2010 +0000
@@ -664,7 +664,7 @@
     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 @@
     st->need_parsing = AVSTREAM_PARSE_FULL;
 
     ff_id3v1_read(s);
-    ff_id3v2_read(s);
+    ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC);
 
     return 0;
 }