generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move ID3v1 skip from decoder to demuxer

Browse Source 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 045b80e52df7ba9c97084c946b4929000d5f5bc7)
This commit is contained in:
Clément Bœsch 2011-01-21 23:55:31 +01:00 committed by Michael Niedermayer
parent 05238927b7
commit 204a18151c
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegaudiodec.c
View File

@ -27,7 +27,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "dsputil.h" #include "dsputil.h"
#include "libavformat/id3v1.h"
/* /*
* TODO: * TODO:
@ -2044,13 +2043,6 @@ static int decode_frame(AVCodecContext * avctx,
header = AV_RB32(buf); header = AV_RB32(buf);
if(ff_mpa_check_header(header) < 0){ if(ff_mpa_check_header(header) < 0){
if (buf_size == ID3v1_TAG_SIZE
&& buf[0] == 'T' && buf[1] == 'A' && buf[2] == 'G') {
*data_size = 0;
return ID3v1_TAG_SIZE;
}
av_log(avctx, AV_LOG_ERROR, "Header missing\n"); av_log(avctx, AV_LOG_ERROR, "Header missing\n");
return -1; return -1;
} }

5
libavformat/mp3dec.c
View File

@ -174,6 +174,11 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
if (ret <= 0) { if (ret <= 0) {
return AVERROR(EIO); return AVERROR(EIO);
} }
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 /* note: we need to modify the packet size here to handle the last
packet */ packet */
pkt->size = ret; pkt->size = ret;