RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/aiffdec: handle ID3 chunk 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Matthieu Bouron 2012-06-30 19:05:05 +02:00 committed by Michael Niedermayer
parent 87b9868972
commit 8ac3868ff3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/aiffdec.c
View File

@ -26,6 +26,7 @@
#include "pcm.h" #include "pcm.h"
#include "aiff.h" #include "aiff.h"
#include "isom.h" #include "isom.h"
#include "id3v2.h"
#define AIFF 0 #define AIFF 0
#define AIFF_C_VERSION1 0xA2805140 #define AIFF_C_VERSION1 0xA2805140
@ -195,6 +196,7 @@ static int aiff_read_header(AVFormatContext *s)
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream * st; AVStream * st;
AIFFInputContext *aiff = s->priv_data; AIFFInputContext *aiff = s->priv_data;
ID3v2ExtraMeta *id3v2_extra_meta = NULL;
/* check FORM header */ /* check FORM header */
filesize = get_tag(pb, &tag); filesize = get_tag(pb, &tag);
@ -231,6 +233,10 @@ static int aiff_read_header(AVFormatContext *s)
if (offset > 0) // COMM is after SSND if (offset > 0) // COMM is after SSND
goto got_sound; goto got_sound;
break; break;
case MKTAG('I', 'D', '3', ' '):
ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);
ff_id3v2_free_extra_meta(&id3v2_extra_meta);
break;
case MKTAG('F', 'V', 'E', 'R'): /* Version chunk */ case MKTAG('F', 'V', 'E', 'R'): /* Version chunk */
version = avio_rb32(pb); version = avio_rb32(pb);
break; break;