[FFmpeg-cvslog] mp3decoder: discard ID3 tags

Michael Niedermayer git at videolan.org
Tue May 8 03:52:24 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May  8 03:13:37 2012 +0200| [3183c38aaabc6c8a1f9b8b8495a91d9b37d7b9e6] | committer: Michael Niedermayer

mp3decoder: discard ID3 tags

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3183c38aaabc6c8a1f9b8b8495a91d9b37d7b9e6
---

 libavcodec/mpegaudiodec.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 97246ac..6a2b0fd 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -1641,6 +1641,10 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr,
         return AVERROR_INVALIDDATA;
 
     header = AV_RB32(buf);
+    if (header>>8 == AV_RB32("TAG")>>8) {
+        av_log(avctx, AV_LOG_DEBUG, "discarding ID3 tag\n");
+        return buf_size;
+    }
     if (ff_mpa_check_header(header) < 0) {
         av_log(avctx, AV_LOG_ERROR, "Header missing\n");
         return AVERROR_INVALIDDATA;



More information about the ffmpeg-cvslog mailing list