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/tta.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/tta.c')
| -rw-r--r-- | libavformat/tta.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavformat/tta.c b/libavformat/tta.c index 628932da0c..64ed4d819a 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -21,7 +21,6 @@ #include "libavcodec/get_bits.h" #include "avformat.h" -#include "id3v2.h" #include "id3v1.h" typedef struct { @@ -32,12 +31,6 @@ static int tta_probe(AVProbeData *p) { const uint8_t *d = p->buf; - if (ff_id3v2_match(d, ID3v2_DEFAULT_MAGIC)) - d += ff_id3v2_tag_len(d); - - if (d - p->buf >= p->buf_size) - return 0; - if (d[0] == 'T' && d[1] == 'T' && d[2] == 'A' && d[3] == '1') return 80; return 0; @@ -50,7 +43,6 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap) int i, channels, bps, samplerate, datalen, framelen; uint64_t framepos, start_offset; - ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC); if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) ff_id3v1_read(s); |