vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Thu May 29 16:18:47 2014 +0200| [ad7f67f398331ebaa8194e8aa199857b3b03906f] | committer: Francois Cartegnie
demux: mp4: export ContainerChildren instead of ContainedRaw So we can stop probing at some point. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad7f67f398331ebaa8194e8aa199857b3b03906f --- modules/demux/mp4/libmp4.c | 6 +++--- modules/demux/mp4/libmp4.h | 3 ++- modules/demux/mp4/mp4.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index 2125975..4ac1ba1 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -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 * you need to call MP4_GotoBox to go where you want *****************************************************************************/ -static int MP4_ReadBoxContainerChildren( stream_t *p_stream, - MP4_Box_t *p_container, uint32_t i_last_child ) +int MP4_ReadBoxContainerChildren( stream_t *p_stream, + MP4_Box_t *p_container, uint32_t i_last_child ) { MP4_Box_t *p_box; @@ -226,7 +226,7 @@ static int MP4_ReadBoxContainerChildren( stream_t *p_stream, 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 ); } diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h index 6850b2b..fe192b7 100644 --- a/modules/demux/mp4/libmp4.h +++ b/modules/demux/mp4/libmp4.h @@ -1563,7 +1563,8 @@ int MP4_BoxCount( MP4_Box_t *p_box, const char *psz_fmt, ... ); /* Internal functions exposed for MKV demux */ 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 ); void MP4_FreeBox_sample_vide( MP4_Box_t *p_box ); diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index a365992..7e107d4 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -4297,7 +4297,7 @@ static int ProbeFragments( demux_t *p_demux ) assert( p_sys->p_root ); - MP4_ReadBoxContainerRaw( p_demux->s, p_sys->p_root ); /* Get the rest of the file */ + MP4_ReadBoxContainerChildren( 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" ); if ( !p_moov ) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
