[vlc-commits] commit: MP4: support for the \xa9too atom (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue May 25 15:44:41 2010 +0200| [3ebe37d27e97cafa647292eca25ee77c4c207501] | committer: Jean-Baptiste Kempf 

MP4: support for the \xa9too atom

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

 modules/demux/mp4/libmp4.c |    1 +
 modules/demux/mp4/libmp4.h |    1 +
 modules/demux/mp4/mp4.c    |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index e8e10e5..28e5aa4 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -2768,6 +2768,7 @@ static const struct
     { FOURCC_0xa9url,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
     { FOURCC_0xa9ope,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
     { FOURCC_0xa9com,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
+    { FOURCC_0xa9too,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
 
     { FOURCC_chpl,   MP4_ReadBox_chpl,          MP4_FreeBox_chpl },
 
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 6792a86..139da50 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -220,6 +220,7 @@
 #define FOURCC_0xa9wrt VLC_FOURCC( 0xa9, 'w', 'r', 't' )
 #define FOURCC_0xa9com VLC_FOURCC( 0xa9, 'c', 'o', 'm' )
 #define FOURCC_0xa9gen VLC_FOURCC( 0xa9, 'g', 'e', 'n' )
+#define FOURCC_0xa9too VLC_FOURCC( 0xa9, 't', 'o', 'o' )
 #define FOURCC_chpl VLC_FOURCC( 'c', 'h', 'p', 'l' )
 #define FOURCC_WLOC VLC_FOURCC( 'W', 'L', 'O', 'C' )
 
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index b044ea9..61a8a6a 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -932,6 +932,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                     SET( vlc_meta_SetURL );
                     break;
 
+                case FOURCC_0xa9too: /* Encoder Tool */
                 case FOURCC_0xa9enc: /* Encoded By */
                     SET( vlc_meta_SetEncodedBy );
                     break;