highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle ID3v1 tag while decoding mp[123] frames

Browse Source 
patch by Clément Bœsch (ubitux at gmail)

Originally committed as revision 26297 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Clément Bœsch
2011-01-10 11:36:11 +00:00
committed by Anton Khirnov
parent 4da766ce65
commit c19a216af3
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegaudiodec.c
View File

@@ -27,6 +27,7 @@
#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:
@@ -2043,6 +2044,13 @@ 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;
} }