avformat/mp3dec: Remove the ID3v1 tag removial code

The code is simply broken, the read packets are not aligned to
the mp3 frames, the file end or the id3 tag thus this simply
cannot reliably find the ID3v1 tag to remove it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 841e0ca4b492d4619c8cca7431e022a7caa1c190..ff794ff277731584cd9319b43956909d088dd5a9 100644 (file)
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -415,13 +415,6 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
     pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
     pkt->stream_index = 0;
 
-    if (ret >= ID3v1_TAG_SIZE &&
-        memcmp(&pkt->data[ret - ID3v1_TAG_SIZE], "TAG", 3) == 0)
-        ret -= ID3v1_TAG_SIZE;
-
-    /* note: we need to modify the packet size here to handle the last
-       packet */
-    pkt->size = ret;
     return ret;
 }
 

diff --git a/libavformat/version.h b/libavformat/version.h
index ec84570b8b86a944d6e9d7e3f7f8242a7ba803c3..0ace5b57760b38cf63191c8968dcef4c11aa907e 100644 (file)
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR 56
 #define LIBAVFORMAT_VERSION_MINOR  38
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \