vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Mon Oct 20 17:14:46 2014 +0200| [59dbabddbaed67e2d09db73c4e8b554e2116cb2c] | committer: Francois Cartegnie
demux: libmp4: add few encoders > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=59dbabddbaed67e2d09db73c4e8b554e2116cb2c --- modules/demux/mp4/libmp4.c | 3 +++ modules/demux/mp4/libmp4.h | 3 +++ modules/demux/mp4/meta.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index 3c7850c..5cc17a0 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -3748,6 +3748,8 @@ static const struct { ATOM_xid_, MP4_ReadBox_Metadata, MP4_FreeBox_Common, ATOM_ilst }, /* udta */ + { ATOM_0x40PRM, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, + { ATOM_0x40PRQ, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, { ATOM_0xa9ART, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, { ATOM_0xa9alb, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, { ATOM_0xa9ard, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, @@ -3798,6 +3800,7 @@ static const struct { ATOM_0xa9xpd, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, { ATOM_0xa9xyz, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, { ATOM_chpl, MP4_ReadBox_chpl, MP4_FreeBox_chpl, ATOM_udta }, /* nero unlabeled chapters list */ + { ATOM_MCPS, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, { ATOM_name, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, { ATOM_vndr, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, { ATOM_SDLN, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta }, diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h index b88739a..bccf302 100644 --- a/modules/demux/mp4/libmp4.h +++ b/modules/demux/mp4/libmp4.h @@ -309,7 +309,10 @@ #define ATOM_tsel VLC_FOURCC( 't', 's', 'e', 'l' ) #define ATOM_xid_ VLC_FOURCC( 'x', 'i', 'd', ' ' ) +#define ATOM_0x40PRM VLC_FOURCC( '@', 'P', 'R', 'M' ) +#define ATOM_0x40PRQ VLC_FOURCC( '@', 'P', 'R', 'Q' ) #define ATOM_chap VLC_FOURCC( 'c', 'h', 'a', 'p' ) +#define ATOM_MCPS VLC_FOURCC( 'M', 'C', 'P', 'S' ) #define ATOM_SDLN VLC_FOURCC( 'S', 'D', 'L', 'N' ) #define ATOM_vndr VLC_FOURCC( 'v', 'n', 'd', 'r' ) diff --git a/modules/demux/mp4/meta.c b/modules/demux/mp4/meta.c index 4d1ab9f..b4af393 100644 --- a/modules/demux/mp4/meta.c +++ b/modules/demux/mp4/meta.c @@ -32,6 +32,8 @@ static const struct const uint32_t xa9_type; const vlc_meta_type_t meta_type; } xa9typetometa[] = { + { ATOM_0x40PRM, vlc_meta_EncodedBy }, /* Adobe Premiere */ + { ATOM_0x40PRQ, vlc_meta_EncodedBy }, /* Adobe Qt */ { ATOM_0xa9nam, vlc_meta_Title }, /* Full name */ { ATOM_0xa9aut, vlc_meta_Artist }, { ATOM_0xa9ART, vlc_meta_Artist }, @@ -47,6 +49,7 @@ static const struct { ATOM_0xa9enc, vlc_meta_EncodedBy }, /* Encoded By */ { ATOM_0xa9pub, vlc_meta_Publisher }, { ATOM_0xa9dir, vlc_meta_Director }, + { ATOM_MCPS, vlc_meta_EncodedBy }, /* Cleaner Pro */ { 0, 0 }, }; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits