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

1 files changed, 0 insertions, 14 deletions

diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index e54fb395ff..6922b6ce3f 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -22,14 +22,12 @@
 #include "libavcodec/flac.h"
 #include "avformat.h"
 #include "rawdec.h"
-#include "id3v2.h"
 #include "oggdec.h"
 #include "vorbiscomment.h"
 
 static int flac_read_header(AVFormatContext *s,
                              AVFormatParameters *ap)
 {
-    uint8_t buf[ID3v2_HEADER_SIZE];
     int ret, metadata_last=0, metadata_type, metadata_size, found_streaminfo=0;
     uint8_t header[4];
     uint8_t *buffer=NULL;
@@ -41,15 +39,6 @@ static int flac_read_header(AVFormatContext *s,
     st->need_parsing = AVSTREAM_PARSE_FULL;
     /* the parameters will be extracted from the compressed bitstream */
 
-    /* skip ID3v2 header if found */
-    ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE);
-    if (ret == ID3v2_HEADER_SIZE && ff_id3v2_match(buf, ID3v2_DEFAULT_MAGIC)) {
-        int len = ff_id3v2_tag_len(buf);
-        url_fseek(s->pb, len - ID3v2_HEADER_SIZE, SEEK_CUR);
-    } else {
-        url_fseek(s->pb, 0, SEEK_SET);
-    }
-
     /* if fLaC marker is not found, assume there is no header */
     if (get_le32(s->pb) != MKTAG('f','L','a','C')) {
         url_fseek(s->pb, -4, SEEK_CUR);
@@ -130,9 +119,6 @@ static int flac_probe(AVProbeData *p)
     uint8_t *bufptr = p->buf;
     uint8_t *end    = p->buf + p->buf_size;
 
-    if(ff_id3v2_match(bufptr, ID3v2_DEFAULT_MAGIC))
-        bufptr += ff_id3v2_tag_len(bufptr);
-
     if(bufptr > end-4 || memcmp(bufptr, "fLaC", 4)) return 0;
     else                                            return AVPROBE_SCORE_MAX/2;
 }