[vlc-commits] AVI: add more main tags

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon May 21 13:44:27 2012 +0200| [fd638b53820795be8d492ed8c9d37bfe8d4127f9] | committer: Jean-Baptiste Kempf

AVI: add more main tags

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fd638b53820795be8d492ed8c9d37bfe8d4127f9
---

 modules/demux/avi/avi.c    |    4 ++++
 modules/demux/avi/libavi.c |    5 ++++-
 modules/demux/avi/libavi.h |    6 +++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 334fece..dfc6ddf 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -2549,6 +2549,10 @@ static void AVI_MetaLoad( demux_t *p_demux,
         { AVIFOURCC_IGNR, vlc_meta_Genre },
         { AVIFOURCC_INAM, vlc_meta_Title },
         { AVIFOURCC_ICRD, vlc_meta_Date },
+        { AVIFOURCC_ILNG, vlc_meta_Language },
+        { AVIFOURCC_IRTD, vlc_meta_Rating },
+        { AVIFOURCC_IWEB, vlc_meta_URL },
+        { AVIFOURCC_IPRT, vlc_meta_TrackNumber },
         { 0, -1 }
     };
     for( int i = 0; p_dsc[i].i_id != 0; i++ )
diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index 2a39131..b86a1dd 100644
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -710,7 +710,6 @@ static const struct
     { AVIFOURCC_JUNK, AVI_ChunkRead_nothing, AVI_ChunkFree_nothing },
 
     { AVIFOURCC_IARL, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
-    { AVIFOURCC_IARL, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
     { AVIFOURCC_IART, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
     { AVIFOURCC_ICMS, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
     { AVIFOURCC_ICMT, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
@@ -735,6 +734,10 @@ static const struct
     { AVIFOURCC_ITCH, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
     { AVIFOURCC_ISMP, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
     { AVIFOURCC_IDIT, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+    { AVIFOURCC_ILNG, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+    { AVIFOURCC_IRTD, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+    { AVIFOURCC_IWEB, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
+    { AVIFOURCC_IPRT, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
     { AVIFOURCC_strn, AVI_ChunkRead_strz, AVI_ChunkFree_strz },
     { 0,           NULL,               NULL }
 };
diff --git a/modules/demux/avi/libavi.h b/modules/demux/avi/libavi.h
index 14a930e..38fe2c8 100644
--- a/modules/demux/avi/libavi.h
+++ b/modules/demux/avi/libavi.h
@@ -320,8 +320,12 @@ void    AVI_ChunkFreeRoot( stream_t *, avi_chunk_t  *p_chk );
 #define AVIFOURCC_ITCH         VLC_FOURCC('I','T','C','H')
 #define AVIFOURCC_ISMP         VLC_FOURCC('I','S','M','P')
 #define AVIFOURCC_IDIT         VLC_FOURCC('I','D','I','T')
+#define AVIFOURCC_ILNG         VLC_FOURCC('I','L','N','G')
+#define AVIFOURCC_IRTD         VLC_FOURCC('I','R','T','D')
+#define AVIFOURCC_IWEB         VLC_FOURCC('I','W','E','B')
+#define AVIFOURCC_IPRT         VLC_FOURCC('I','P','R','T')
+
 
- 
 #define AVITWOCC_wb            VLC_TWOCC('w','b')
 #define AVITWOCC_db            VLC_TWOCC('d','b')
 #define AVITWOCC_dc            VLC_TWOCC('d','c')