diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-24 02:46:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-24 02:52:11 +0200 |
| commit | 041aa800f22090e0b7ff2a79098d632c9e3a7e92 (patch) | |
| tree | 16ca371bc859682a683c1051ac6602995d8170ac /libavformat | |
| parent | 89a420b71b531bcd0344f39d0390c26f3e0173ea (diff) | |
| download | ffmpeg-041aa800f22090e0b7ff2a79098d632c9e3a7e92.tar.gz | |
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mp3dec.c | 7 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 841e0ca4b4..ff794ff277 100644 --- 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 ec84570b8b..0ace5b5776 100644 --- 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, \ |