diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2012-06-30 19:05:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 20:59:37 +0200 |
| commit | 8ac3868ff3d8d028d533bcde65d0470b48531057 (patch) | |
| tree | 3ff3b41a65088caac0594bcbbdd0c44d10cecfcb /libavformat | |
| parent | 87b98689726360f61bacb7681a05ba677a218751 (diff) | |
| download | ffmpeg-8ac3868ff3d8d028d533bcde65d0470b48531057.tar.gz | |
lavf/aiffdec: handle ID3 chunk
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/aiffdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 4083316450..3382e8a4c1 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -26,6 +26,7 @@ #include "pcm.h" #include "aiff.h" #include "isom.h" +#include "id3v2.h" #define AIFF 0 #define AIFF_C_VERSION1 0xA2805140 @@ -195,6 +196,7 @@ static int aiff_read_header(AVFormatContext *s) AVIOContext *pb = s->pb; AVStream * st; AIFFInputContext *aiff = s->priv_data; + ID3v2ExtraMeta *id3v2_extra_meta = NULL; /* check FORM header */ filesize = get_tag(pb, &tag); @@ -231,6 +233,10 @@ static int aiff_read_header(AVFormatContext *s) if (offset > 0) // COMM is after SSND goto got_sound; 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 */ version = avio_rb32(pb); break; |