Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
ad7f67f3
Commit
ad7f67f3
authored
May 29, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: export ContainerChildren instead of ContainedRaw
So we can stop probing at some point.
parent
1a970471
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+3
-3
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+2
-1
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+1
-1
No files found.
modules/demux/mp4/libmp4.c
View file @
ad7f67f3
...
@@ -190,8 +190,8 @@ static int MP4_NextBox( stream_t *p_stream, MP4_Box_t *p_box )
...
@@ -190,8 +190,8 @@ static int MP4_NextBox( stream_t *p_stream, MP4_Box_t *p_box )
* after called one of theses functions, file position is unknown
* after called one of theses functions, file position is unknown
* you need to call MP4_GotoBox to go where you want
* you need to call MP4_GotoBox to go where you want
*****************************************************************************/
*****************************************************************************/
static
int
MP4_ReadBoxContainerChildren
(
stream_t
*
p_stream
,
int
MP4_ReadBoxContainerChildren
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_container
,
uint32_t
i_last_child
)
MP4_Box_t
*
p_container
,
uint32_t
i_last_child
)
{
{
MP4_Box_t
*
p_box
;
MP4_Box_t
*
p_box
;
...
@@ -226,7 +226,7 @@ static int MP4_ReadBoxContainerChildren( stream_t *p_stream,
...
@@ -226,7 +226,7 @@ static int MP4_ReadBoxContainerChildren( stream_t *p_stream,
return
1
;
return
1
;
}
}
int
MP4_ReadBoxContainerRaw
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_container
)
static
int
MP4_ReadBoxContainerRaw
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_container
)
{
{
return
MP4_ReadBoxContainerChildren
(
p_stream
,
p_container
,
0
);
return
MP4_ReadBoxContainerChildren
(
p_stream
,
p_container
,
0
);
}
}
...
...
modules/demux/mp4/libmp4.h
View file @
ad7f67f3
...
@@ -1563,7 +1563,8 @@ int MP4_BoxCount( MP4_Box_t *p_box, const char *psz_fmt, ... );
...
@@ -1563,7 +1563,8 @@ int MP4_BoxCount( MP4_Box_t *p_box, const char *psz_fmt, ... );
/* Internal functions exposed for MKV demux */
/* Internal functions exposed for MKV demux */
int
MP4_ReadBoxCommon
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
);
int
MP4_ReadBoxCommon
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
);
int
MP4_ReadBoxContainerRaw
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_container
);
int
MP4_ReadBoxContainerChildren
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_container
,
uint32_t
i_last_child
);
int
MP4_ReadBox_sample_vide
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
);
int
MP4_ReadBox_sample_vide
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
);
void
MP4_FreeBox_sample_vide
(
MP4_Box_t
*
p_box
);
void
MP4_FreeBox_sample_vide
(
MP4_Box_t
*
p_box
);
...
...
modules/demux/mp4/mp4.c
View file @
ad7f67f3
...
@@ -4297,7 +4297,7 @@ static int ProbeFragments( demux_t *p_demux )
...
@@ -4297,7 +4297,7 @@ static int ProbeFragments( demux_t *p_demux )
assert
(
p_sys
->
p_root
);
assert
(
p_sys
->
p_root
);
MP4_ReadBoxContainer
Raw
(
p_demux
->
s
,
p_sys
->
p_root
);
/* Get the rest of the file */
MP4_ReadBoxContainer
Children
(
p_demux
->
s
,
p_sys
->
p_root
,
0
);
/* Get the rest of the file */
MP4_Box_t
*
p_moov
=
MP4_BoxGet
(
p_sys
->
p_root
,
"/moov"
);
MP4_Box_t
*
p_moov
=
MP4_BoxGet
(
p_sys
->
p_root
,
"/moov"
);
if
(
!
p_moov
)
if
(
!
p_moov
)
...
...
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