From 3183c38aaabc6c8a1f9b8b8495a91d9b37d7b9e6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 8 May 2012 03:13:37 +0200 Subject: [PATCH] mp3decoder: discard ID3 tags Signed-off-by: Michael Niedermayer --- libavcodec/mpegaudiodec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 97246ac8b0..6a2b0fdd53 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;