[vlc-commits] demux: mp4: do not expose hint box readers

Francois Cartegnie git at videolan.org
Sat May 21 17:05:35 CEST 2016


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat May 21 15:11:37 2016 +0200| [6629048035ec7772d2007094a02099845abbc370] | committer: Francois Cartegnie

demux: mp4: do not expose hint box readers

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6629048035ec7772d2007094a02099845abbc370
---

 modules/demux/mp4/libmp4.c |   12 ++++++------
 modules/demux/mp4/libmp4.h |    3 ---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index f25d426..d049fa4 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -2313,7 +2313,12 @@ static int MP4_ReadBox_sample_mp4s( stream_t *p_stream, MP4_Box_t *p_box )
     MP4_READBOX_EXIT( 1 );
 }
 
-int MP4_ReadBox_sample_hint8( stream_t *p_stream, MP4_Box_t *p_box )
+static void MP4_FreeBox_sample_hint( MP4_Box_t *p_box )
+{
+    FREENULL( p_box->data.p_sample_hint->p_data );
+}
+
+static int MP4_ReadBox_sample_hint8( stream_t *p_stream, MP4_Box_t *p_box )
 {
     MP4_READBOX_ENTER_PARTIAL( MP4_Box_data_sample_hint_t, 24, MP4_FreeBox_sample_hint );
 
@@ -2337,11 +2342,6 @@ int MP4_ReadBox_sample_hint8( stream_t *p_stream, MP4_Box_t *p_box )
     MP4_READBOX_EXIT( 1 );
 }
 
-void MP4_FreeBox_sample_hint( MP4_Box_t *p_box )
-{
-    FREENULL( p_box->data.p_sample_hint->p_data );
-}
-
 static int MP4_ReadBox_sample_text( stream_t *p_stream, MP4_Box_t *p_box )
 {
     int32_t t;
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index c717ae2..3e66350 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -1836,7 +1836,4 @@ int MP4_ReadBoxContainerChildren( stream_t *p_stream, MP4_Box_t *p_container,
 int MP4_ReadBox_sample_vide( stream_t *p_stream, MP4_Box_t *p_box );
 void MP4_FreeBox_sample_vide( MP4_Box_t *p_box );
 
-int MP4_ReadBox_sample_hint8( stream_t *p_stream, MP4_Box_t *p_box );
-void MP4_FreeBox_sample_hint( MP4_Box_t *p_box );
-
 #endif



More information about the vlc-commits mailing list