[FFmpeg-cvslog] lavf/aiffdec: handle ID3 chunk

Matthieu Bouron git at videolan.org
Sun Jul 1 21:09:46 CEST 2012


ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at gmail.com> | Sat Jun 30 19:05:05 2012 +0200| [8ac3868ff3d8d028d533bcde65d0470b48531057] | committer: Michael Niedermayer

lavf/aiffdec: handle ID3 chunk

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ac3868ff3d8d028d533bcde65d0470b48531057
---

 libavformat/aiffdec.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 4083316..3382e8a 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;



More information about the ffmpeg-cvslog mailing list