[vlc-commits] demux: mp4: move mfro size to libmp4

Francois Cartegnie git at videolan.org
Thu Jun 26 22:03:54 CEST 2014


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jun 26 19:28:35 2014 +0200| [ed8078103b45120368399134a0ba3569f1658945] | committer: Francois Cartegnie

demux: mp4: move mfro size to libmp4

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

 modules/demux/mp4/libmp4.h |    1 +
 modules/demux/mp4/mp4.c    |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 9c8212a..30a5534 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -276,6 +276,7 @@
 
 struct MP4_Box_s;
 
+#define MP4_MFRO_BOXSIZE 16
 
 /* uuid Universal Unique IDentifiers */
 typedef struct UUID_s
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index df158af..98877f6 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -4605,7 +4605,6 @@ static bool AddFragment( demux_t *p_demux, MP4_Box_t *p_moox )
     return true;
 }
 
-#define MP4_MFRO_BOXSIZE 16
 static int ProbeIndex( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
@@ -4643,7 +4642,6 @@ static int ProbeIndex( demux_t *p_demux )
 
     return stream_Seek( p_demux->s, i_backup_pos );
 }
-#undef MP4_MFRO_BOXSIZE
 
 static int ProbeFragments( demux_t *p_demux, bool b_force )
 {



More information about the vlc-commits mailing list