[vlc-commits] demux: mp4: add missing samsung atoms

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Oct 14 19:28:24 2014 +0200| [53cdf004842566c0d0c7c91f46cf0b8f7990185a] | committer: Francois Cartegnie

demux: mp4: add missing samsung atoms

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

 modules/demux/mp4/libmp4.c |    2 ++
 modules/demux/mp4/libmp4.h |    2 ++
 modules/demux/mp4/mp4.c    |    1 +
 3 files changed, 5 insertions(+)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 7e9afd8..a57e8fa 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3738,6 +3738,8 @@ static const struct
     { ATOM_gnre,    MP4_ReadBox_gnre,         MP4_FreeBox_Common,  ATOM_udta },
     { ATOM_name,    MP4_ReadBox_String,       MP4_FreeBox_String,  ATOM_udta },
     { ATOM_trkn,    MP4_ReadBox_trkn,         MP4_FreeBox_Common,  ATOM_udta },
+    { ATOM_vndr,    MP4_ReadBox_String,       MP4_FreeBox_String,  ATOM_udta },
+    { ATOM_SDLN,    MP4_ReadBox_String,       MP4_FreeBox_String,  ATOM_udta },
 
     /* iTunes/Quicktime meta info */
     { ATOM_meta,    MP4_ReadBox_meta,         MP4_FreeBox_Common,  0 },
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index a888d2e..50fe38f 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -285,6 +285,8 @@
 #define ATOM_covr VLC_FOURCC( 'c', 'o', 'v', 'r' )
 
 #define ATOM_chap VLC_FOURCC( 'c', 'h', 'a', 'p' )
+#define ATOM_SDLN VLC_FOURCC( 'S', 'D', 'L', 'N' )
+#define ATOM_vndr VLC_FOURCC( 'v', 'n', 'd', 'r' )
 
 /* Do you want some debug information on all read boxes ? */
 #ifndef NDEBUG
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index eb6b64f..a5ffe77 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -1626,6 +1626,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                     { ATOM_0xa9sol, N_("Soloist") },
                     { ATOM_0xa9thx, N_("Thanks") },
                     { ATOM_0xa9xpd, N_("Executive Producer") },
+                    { ATOM_vndr,    N_("Vendor") },
                     { 0, "" },
                 };
                 for( unsigned i = 0; xa9typetoextrameta[i].xa9_type; i++ )