vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Thu Oct 16 19:05:40 2014 +0200| [b50d837343969cda3bc6d4a63c646ab38a89f3d4] | committer: Francois Cartegnie
demux: libmp4: add flvr atom > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b50d837343969cda3bc6d4a63c646ab38a89f3d4 --- modules/demux/mp4/libmp4.c | 1 + modules/demux/mp4/libmp4.h | 1 + modules/demux/mp4/meta.c | 1 + 3 files changed, 3 insertions(+) diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index 9d868ed..9ce70c2 100644 --- 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 a4d62bb..bfd1219 100644 --- 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 d0f9417..9e36897 100644 --- 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, "" }, _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
