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/mp3.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/mp3.c')
| -rw-r--r-- | libavformat/mp3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c index dcb59e8417..bdb2e4ec0a 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -42,7 +42,7 @@ static int mp3_read_probe(AVProbeData *p) AVCodecContext avctx; buf0 = p->buf; - if(ff_id3v2_match(buf0)) { + if(ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC)) { buf0 += ff_id3v2_tag_len(buf0); } end = p->buf + p->buf_size - sizeof(uint32_t); @@ -148,7 +148,7 @@ static int mp3_read_header(AVFormatContext *s, // lcm of all mp3 sample rates av_set_pts_info(st, 64, 1, 14112000); - ff_id3v2_read(s); + ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC); off = url_ftell(s->pb); if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) |