Skip to content

V
vlc
Commit 71fee295 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

demux: libmp4: udta atoms are not containers 

Only ilst have metadata as data atoms
parent d792f033
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 48 deletions
modules/demux/mp4/libmp4.c
View file @ 71fee295
......@@ -3739,54 +3739,55 @@ static const struct
{ ATOM_xid_, MP4_ReadBox_Metadata, MP4_FreeBox_Common, ATOM_ilst },
/* udta */
{ ATOM_0xa9ART, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9alb, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9ard, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9arg, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9aut, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9cak, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9cmt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9con, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9com, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9cpy, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9day, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9des, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9dir, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9dis, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9dsa, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9fmt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9gen, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9grp, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9hst, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9inf, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9isr, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9lab, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9lal, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9lnt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9lyr, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9mak, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9mal, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9mod, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9ope, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9phg, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9PRD, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9prd, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9prf, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9pub, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9req, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9sne, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9snm, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9sol, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9src, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9st3, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9swr, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9thx, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9too, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9trk, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9url, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9wrn, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9xpd, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_udta },
{ ATOM_0xa9xyz, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, 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 },
{ ATOM_0xa9arg, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9aut, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9cak, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9cmt, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9con, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9com, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9cpy, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9day, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9des, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9dir, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9dis, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9dsa, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9fmt, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9gen, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9grp, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9hst, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9inf, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9isr, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9lab, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9lal, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9lnt, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9lyr, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9mak, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9mal, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9mod, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9nam, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9ope, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9phg, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9PRD, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9prd, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9prf, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9pub, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9req, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9sne, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9snm, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9sol, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9src, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9st3, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9swr, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9thx, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9too, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9trk, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9url, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9wrn, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9xpd, MP4_ReadBox_String, MP4_FreeBox_String, ATOM_udta },
{ ATOM_0xa9xyz, 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 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment