[vlc-commits] mux: mp4: prefix with mp4mux

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Aug  8 14:01:09 2016 +0200| [d30fd6110115b81a98642196d89bfce578706a26] | committer: Francois Cartegnie

mux: mp4: prefix with mp4mux

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

 modules/demux/smooth/playlist/ForgedInitSegment.cpp | 4 ++--
 modules/mux/mp4/libmp4mux.c                         | 4 ++--
 modules/mux/mp4/libmp4mux.h                         | 4 ++--
 modules/mux/mp4/mp4.c                               | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.cpp b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
index 2ddc273..2c3df21 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.cpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
@@ -273,7 +273,7 @@ block_t * ForgedInitSegment::buildMoovBox()
         trackinfo.fmt.psz_language = strdup(language.c_str());
 
     mp4mux_trackinfo_t *p_tracks = &trackinfo;
-    bo_t *box = GetMoovBox(NULL, &p_tracks, 1, true, false, false, false);
+    bo_t *box = mp4mux_GetMoovBox(NULL, &p_tracks, 1, true, false, false, false);
     mp4mux_trackinfo_Clear(&trackinfo);
 
     block_t *moov = NULL;
@@ -287,7 +287,7 @@ block_t * ForgedInitSegment::buildMoovBox()
         return NULL;
 
     vlc_fourcc_t extra[] = {MAJOR_isom, VLC_FOURCC('p','i','f','f'), VLC_FOURCC('i','s','o','2'), VLC_FOURCC('s','m','o','o')};
-    box = GetFtyp(VLC_FOURCC('i','s','m','l'), 1, extra, ARRAY_SIZE(extra));
+    box = mp4mux_GetFtyp(VLC_FOURCC('i','s','m','l'), 1, extra, ARRAY_SIZE(extra));
 
     if(box)
     {
diff --git a/modules/mux/mp4/libmp4mux.c b/modules/mux/mp4/libmp4mux.c
index 98ef5d6..fabde93 100644
--- a/modules/mux/mp4/libmp4mux.c
+++ b/modules/mux/mp4/libmp4mux.c
@@ -1376,7 +1376,7 @@ static bo_t *GetStblBox(vlc_object_t *p_obj, mp4mux_trackinfo_t *p_track, bool b
     return stbl;
 }
 
-bo_t * GetMoovBox(vlc_object_t *p_obj, mp4mux_trackinfo_t **pp_tracks, unsigned int i_tracks,
+bo_t * mp4mux_GetMoovBox(vlc_object_t *p_obj, mp4mux_trackinfo_t **pp_tracks, unsigned int i_tracks,
                   bool b_fragmented, bool b_mov, bool b_64_ext, bool b_stco64)
 {
     bo_t            *moov, *mvhd;
@@ -1817,7 +1817,7 @@ bo_t * GetMoovBox(vlc_object_t *p_obj, mp4mux_trackinfo_t **pp_tracks, unsigned
     return moov;
 }
 
-bo_t *GetFtyp(vlc_fourcc_t major, uint32_t minor, vlc_fourcc_t extra[], size_t i_fourcc)
+bo_t *mp4mux_GetFtyp(vlc_fourcc_t major, uint32_t minor, vlc_fourcc_t extra[], size_t i_fourcc)
 {
     bo_t *box = box_new("ftyp");
     if(box)
diff --git a/modules/mux/mp4/libmp4mux.h b/modules/mux/mp4/libmp4mux.h
index d6d6532..0eb2ae1 100644
--- a/modules/mux/mp4/libmp4mux.h
+++ b/modules/mux/mp4/libmp4mux.h
@@ -71,6 +71,6 @@ bo_t *box_full_new(const char *fcc, uint8_t v, uint32_t f);
 void  box_fix     (bo_t *box, uint32_t);
 void  box_gather  (bo_t *box, bo_t *box2);
 
-bo_t *GetFtyp(vlc_fourcc_t, uint32_t, vlc_fourcc_t[], size_t i_fourcc);
-bo_t *GetMoovBox(vlc_object_t *, mp4mux_trackinfo_t **pp_tracks, unsigned int i_tracks,
+bo_t *mp4mux_GetFtyp(vlc_fourcc_t, uint32_t, vlc_fourcc_t[], size_t i_fourcc);
+bo_t *mp4mux_GetMoovBox(vlc_object_t *, mp4mux_trackinfo_t **pp_tracks, unsigned int i_tracks,
                  bool b_fragmented, bool b_mov, bool b_64ext, bool b_stco64);
diff --git a/modules/mux/mp4/mp4.c b/modules/mux/mp4/mp4.c
index e9bd86c..83c77eb 100644
--- a/modules/mux/mp4/mp4.c
+++ b/modules/mux/mp4/mp4.c
@@ -215,12 +215,12 @@ static int Open(vlc_object_t *p_this)
         if(p_sys->b_3gp)
         {
             vlc_fourcc_t extra[] = {MAJOR_3gp4, MAJOR_avc1};
-            box = GetFtyp(MAJOR_3gp6, 0, extra, ARRAY_SIZE(extra));
+            box = mp4mux_GetFtyp(MAJOR_3gp6, 0, extra, ARRAY_SIZE(extra));
         }
         else
         {
             vlc_fourcc_t extra[] = {MAJOR_mp41, MAJOR_avc1};
-            box = GetFtyp(MAJOR_isom, 0, extra, ARRAY_SIZE(extra));
+            box = mp4mux_GetFtyp(MAJOR_isom, 0, extra, ARRAY_SIZE(extra));
         }
 
         if(!box)
@@ -1158,7 +1158,7 @@ static bo_t *BuildMoov(sout_mux_t *p_mux)
         for(unsigned int i=0; i<p_sys->i_nb_streams; i++)
             pp_infos[i] = &p_sys->pp_streams[i]->mux;
     }
-    bo_t *p_moov = GetMoovBox(VLC_OBJECT(p_mux), pp_infos, p_sys->i_nb_streams,
+    bo_t *p_moov = mp4mux_GetMoovBox(VLC_OBJECT(p_mux), pp_infos, p_sys->i_nb_streams,
                               p_sys->b_fragmented, p_sys->b_mov, p_sys->b_64_ext, b_stco64);
     free(pp_infos);
     return p_moov;
@@ -1169,7 +1169,7 @@ static void FlushHeader(sout_mux_t *p_mux)
     sout_mux_sys_t *p_sys = (sout_mux_sys_t*) p_mux->p_sys;
 
     /* Now add ftyp header */
-    bo_t *ftyp = GetFtyp(MAJOR_isom, 0, NULL, 0);
+    bo_t *ftyp = mp4mux_GetFtyp(MAJOR_isom, 0, NULL, 0);
     if(!ftyp)
         return;