Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
f10ce6e5
Commit
f10ce6e5
authored
May 25, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MP4: support other annotation atoms (wrn, mak, mod, PRD, grp, lyr)
parent
a1ebfadd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
2 deletions
+20
-2
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+6
-0
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+7
-1
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+7
-1
No files found.
modules/demux/mp4/libmp4.c
View file @
f10ce6e5
...
...
@@ -2770,6 +2770,12 @@ static const struct
{
FOURCC_0xa9com
,
MP4_ReadBox_0xa9xxx
,
MP4_FreeBox_0xa9xxx
},
{
FOURCC_0xa9wrt
,
MP4_ReadBox_0xa9xxx
,
MP4_FreeBox_0xa9xxx
},
{
FOURCC_0xa9too
,
MP4_ReadBox_0xa9xxx
,
MP4_FreeBox_0xa9xxx
},
{
FOURCC_0xa9wrn
,
MP4_ReadBox_0xa9xxx
,
MP4_FreeBox_0xa9xxx
},
{
FOURCC_0xa9mak
,
MP4_ReadBox_0xa9xxx
,
MP4_FreeBox_0xa9xxx
},
{
FOURCC_0xa9mod
,
MP4_ReadBox_0xa9xxx
,
MP4_FreeBox_0xa9xxx
},
{
FOURCC_0xa9PRD
,
MP4_ReadBox_0xa9xxx
,
MP4_FreeBox_0xa9xxx
},
{
FOURCC_0xa9grp
,
MP4_ReadBox_0xa9xxx
,
MP4_FreeBox_0xa9xxx
},
{
FOURCC_0xa9lyr
,
MP4_ReadBox_0xa9xxx
,
MP4_FreeBox_0xa9xxx
},
{
FOURCC_chpl
,
MP4_ReadBox_chpl
,
MP4_FreeBox_chpl
},
...
...
modules/demux/mp4/libmp4.h
View file @
f10ce6e5
...
...
@@ -196,7 +196,6 @@
#define FOURCC_0xa9nam VLC_FOURCC( 0xa9, 'n', 'a', 'm' )
#define FOURCC_0xa9aut VLC_FOURCC( 0xa9, 'a', 'u', 't' )
#define FOURCC_0xa9swr VLC_FOURCC( 0xa9, 's', 'w', 'r' )
#define FOURCC_0xa9cpy VLC_FOURCC( 0xa9, 'c', 'p', 'y' )
#define FOURCC_0xa9inf VLC_FOURCC( 0xa9, 'i', 'n', 'f' )
#define FOURCC_0xa9ART VLC_FOURCC( 0xa9, 'A', 'R', 'T' )
...
...
@@ -221,6 +220,13 @@
#define FOURCC_0xa9com VLC_FOURCC( 0xa9, 'c', 'o', 'm' )
#define FOURCC_0xa9gen VLC_FOURCC( 0xa9, 'g', 'e', 'n' )
#define FOURCC_0xa9too VLC_FOURCC( 0xa9, 't', 'o', 'o' )
#define FOURCC_0xa9wrn VLC_FOURCC( 0xa9, 'w', 'r', 'n' )
#define FOURCC_0xa9swr VLC_FOURCC( 0xa9, 's', 'w', 'r' )
#define FOURCC_0xa9mak VLC_FOURCC( 0xa9, 'm', 'a', 'k' )
#define FOURCC_0xa9mod VLC_FOURCC( 0xa9, 'm', 'o', 'd' )
#define FOURCC_0xa9PRD VLC_FOURCC( 0xa9, 'P', 'R', 'D' )
#define FOURCC_0xa9grp VLC_FOURCC( 0xa9, 'g', 'r', 'p' )
#define FOURCC_0xa9lyr VLC_FOURCC( 0xa9, 'g', 'r', 'p' )
#define FOURCC_chpl VLC_FOURCC( 'c', 'h', 'p', 'l' )
#define FOURCC_WLOC VLC_FOURCC( 'W', 'L', 'O', 'C' )
...
...
modules/demux/mp4/mp4.c
View file @
f10ce6e5
...
...
@@ -947,7 +947,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
{
FOURCC_0xa9com
,
N_
(
"Composr"
)
},
{
FOURCC_0xa9prd
,
N_
(
"Producer"
)
},
{
FOURCC_0xa9inf
,
N_
(
"Information"
)
},
{
FOURCC_0xa9swr
,
N_
(
"Software"
)
},
{
FOURCC_0xa9dir
,
N_
(
"Director"
)
},
{
FOURCC_0xa9dis
,
N_
(
"Disclaimer"
)
},
{
FOURCC_0xa9req
,
N_
(
"Requirements"
)
},
...
...
@@ -957,6 +956,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
{
FOURCC_0xa9prf
,
N_
(
"Performers"
)
},
{
FOURCC_0xa9ope
,
N_
(
"Original Performer"
)
},
{
FOURCC_0xa9src
,
N_
(
"Providers Source Content"
)
},
{
FOURCC_0xa9wrn
,
N_
(
"Warning"
)
},
{
FOURCC_0xa9swr
,
N_
(
"Software"
)
},
{
FOURCC_0xa9lyr
,
N_
(
"Lyrics"
)
},
{
FOURCC_0xa9mak
,
N_
(
"Make"
)
},
{
FOURCC_0xa9mod
,
N_
(
"Model"
)
},
{
FOURCC_0xa9PRD
,
N_
(
"Product"
)
},
{
FOURCC_0xa9grp
,
N_
(
"Grouping"
)
},
{
0
,
""
},
};
for
(
unsigned
i
=
0
;
xa9typetoextrameta
[
i
].
xa9_type
;
i
++
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment