diff options
| author | Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de> | 2010-06-11 13:44:57 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-06-11 13:44:57 +0000 |
| commit | 3a1350e8d9955a5eb9ec90f9b3e27ae63c3fb0bb (patch) | |
| tree | 0c5f4ce531628c132328144c7d0e1ed76b642393 /libavformat/raw.c | |
| parent | 1c1697117dbd2923d5876c10a1ebaeec233338b5 (diff) | |
| download | ffmpeg-3a1350e8d9955a5eb9ec90f9b3e27ae63c3fb0bb.tar.gz | |
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
Diffstat (limited to 'libavformat/raw.c')
| -rw-r--r-- | libavformat/raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |