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/aacdec.c | |
| parent | 1136850dd59f52d92d8ba3a70a42fafcdf37c05d (diff) | |
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/aacdec.c')
| -rw-r--r-- | libavformat/aacdec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index bc6c5a8b1f..64ac3d13c6 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -23,7 +23,6 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" #include "rawdec.h" -#include "id3v2.h" #include "id3v1.h" @@ -36,9 +35,6 @@ static int adts_aac_probe(AVProbeData *p) uint8_t *buf; uint8_t *end = buf0 + p->buf_size - 7; - if (ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC)) { - buf0 += ff_id3v2_tag_len(buf0); - } buf = buf0; for(; buf < end; buf= buf2+1) { @@ -78,7 +74,6 @@ static int adts_aac_read_header(AVFormatContext *s, st->need_parsing = AVSTREAM_PARSE_FULL; ff_id3v1_read(s); - ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC); //LCM of all possible ADTS sample rates av_set_pts_info(st, 64, 1, 28224000); |