demux: libmp4: add flvr atom

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 9d868edae5ce28b567ca09e3598a4774c0b04bd7..9ce70c2c45689492d5cb4155b8c8dc9953aa779b 100644 (file)
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3716,6 +3716,7 @@ static const struct
     { ATOM_cnID,    MP4_ReadBox_Metadata,     MP4_FreeBox_Common,  ATOM_ilst }, /* iTunes */
     { ATOM_covr,    MP4_ReadBoxContainer,     MP4_FreeBox_Common,  ATOM_ilst },
     { ATOM_disk,    MP4_ReadBox_Metadata,     MP4_FreeBox_Common,  ATOM_ilst },
+    { ATOM_flvr,    MP4_ReadBox_Metadata,     MP4_FreeBox_Common,  ATOM_ilst },
     { ATOM_gnre,    MP4_ReadBox_Metadata,     MP4_FreeBox_Common,  ATOM_ilst },
     { ATOM_rtng,    MP4_ReadBox_Metadata,     MP4_FreeBox_Common,  ATOM_ilst },
     { ATOM_trkn,    MP4_ReadBox_Metadata,     MP4_FreeBox_Common,  ATOM_ilst },

diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index a4d62bbf8777f4bd869bae3f375689a3371f1703..bfd12190d6b33afe738724c57d6b90b6585d5fee 100644 (file)
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -288,6 +288,7 @@
 #define ATOM_ilst VLC_FOURCC( 'i', 'l', 's', 't' )
 #define ATOM_cnID VLC_FOURCC( 'c', 'n', 'I', 'D' )
 #define ATOM_covr VLC_FOURCC( 'c', 'o', 'v', 'r' )
+#define ATOM_flvr VLC_FOURCC( 'f', 'l', 'v', 'r' )
 #define ATOM_rtng VLC_FOURCC( 'r', 't', 'n', 'g' )
 #define ATOM_xid_ VLC_FOURCC( 'x', 'i', 'd', ' ' )
 

diff --git a/modules/demux/mp4/meta.c b/modules/demux/mp4/meta.c
index d0f9417493361bc832ffca5233ae70f654ca09c3..9e36897c99d1c634d1927448bb7dc36f3d188d78 100644 (file)
--- a/modules/demux/mp4/meta.c
+++ b/modules/demux/mp4/meta.c
@@ -89,6 +89,7 @@ static const struct
     { ATOM_0xa9thx, N_("Thanks") },
     { ATOM_0xa9xpd, N_("Executive Producer") },
     { ATOM_aART,    N_("Album Artist") },
+    { ATOM_flvr,    N_("Encoding Params") },
     { ATOM_vndr,    N_("Vendor") },
     { ATOM_xid_,    N_("Catalog Number") },
     { 0, "" },