vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Wed Nov 4 18:09:24 2015 +0100| [a5737c170eebf6a3cb53688358530fbbd3a5c7e7] | committer: Francois Cartegnie
demux: mp4: remove unused CreateUUID > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a5737c170eebf6a3cb53688358530fbbd3a5c7e7 --- modules/demux/mp4/libmp4.c | 8 +------- modules/demux/mp4/libmp4.h | 9 --------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index 78758a6..8b3ad81 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -159,10 +159,7 @@ int MP4_PeekBoxHeader( stream_t *p_stream, MP4_Box_t *p_box ) /* get extented type on 16 bytes */ GetUUID( &p_box->i_uuid, p_peek ); } - else - { - CreateUUID( &p_box->i_uuid, p_box->i_type ); - } + #ifdef MP4_ULTRA_VERBOSE if( p_box->i_size ) { @@ -4108,9 +4105,6 @@ MP4_Box_t *MP4_BoxGetRoot( stream_t *p_stream ) if( i_size > 0 ) p_vroot->i_size = i_size; - /* could be a DASH stream for exemple, 0 means unknown or infinite size */ - CreateUUID( &p_vroot->i_uuid, p_vroot->i_type ); - /* First get the moov */ const uint32_t stoplist[] = { ATOM_moov, ATOM_mdat, 0 }; i_result = MP4_ReadBoxContainerChildren( p_stream, p_vroot, stoplist ); diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h index 79e7af7..d066e2a 100644 --- a/modules/demux/mp4/libmp4.h +++ b/modules/demux/mp4/libmp4.h @@ -1628,15 +1628,6 @@ static inline int CmpUUID( const UUID_t *u1, const UUID_t *u2 ) return memcmp( u1, u2, 16 ); } -static inline void CreateUUID( UUID_t *p_uuid, uint32_t i_fourcc ) -{ - /* made by 0xXXXXXXXX-0011-0010-8000-00aa00389b71 - where XXXXXXXX is the fourcc */ - /* FIXME implement this */ - (void)p_uuid; - (void)i_fourcc; -} - static const UUID_t TfrfBoxUUID = { { 0xd4, 0x80, 0x7e, 0xf2, 0xca, 0x39, 0x46, 0x95, 0x8e, 0x54, 0x26, 0xcb, 0x9e, 0x46, 0xa7, 0x9f } }; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits