diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-10-06 20:21:07 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-10-06 20:21:07 +0000 |
| commit | 6612d8cf3170a5bf1b3460c22f8c725c02542533 (patch) | |
| tree | 887a00c4d753247b8cdc7639d6a0d21fe8468767 /libavformat/mp3.c | |
| parent | 1136850dd59f52d92d8ba3a70a42fafcdf37c05d (diff) | |
| download | ffmpeg-6612d8cf3170a5bf1b3460c22f8c725c02542533.tar.gz | |
Move handling of ID3v2 to common utils.c code, reducing code duplication
and supporting it for more formats, fixing issue 2258.
Originally committed as revision 25378 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mp3.c')
| -rw-r--r-- | libavformat/mp3.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c index c1622a3567..4dfffec6de 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -42,9 +42,6 @@ static int mp3_read_probe(AVProbeData *p) AVCodecContext avctx; buf0 = p->buf; - if(ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC)) { - buf0 += ff_id3v2_tag_len(buf0); - } end = p->buf + p->buf_size - sizeof(uint32_t); while(buf0 < end && !*buf0) buf0++; @@ -156,7 +153,6 @@ 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, ID3v2_DEFAULT_MAGIC); off = url_ftell(s->pb); if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) |