[vlc-commits] demux: mp4: fix include order

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Mar 25 15:52:17 2016 +0100| [0721eba41482fb52dbaa2b1ea3db7b843a519f4f] | committer: Francois Cartegnie

demux: mp4: fix include order

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

 modules/demux/mp4/fragments.c |    4 ++++
 modules/demux/mp4/fragments.h |    4 ----
 modules/demux/mp4/libmp4.h    |    1 -
 modules/demux/mp4/meta.c      |    3 +++
 modules/demux/mp4/mp4.c       |    7 ++++---
 modules/demux/mp4/mp4.h       |    4 ----
 modules/mux/mp4/libmp4mux.c   |    8 ++++----
 modules/mux/mp4/libmp4mux.h   |    4 ----
 modules/mux/mp4/mp4.c         |    7 +++----
 9 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/modules/demux/mp4/fragments.c b/modules/demux/mp4/fragments.c
index bf8f0e8..d9d460a 100644
--- a/modules/demux/mp4/fragments.c
+++ b/modules/demux/mp4/fragments.c
@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "fragments.h"
 
 mp4_fragment_t * MP4_Fragment_New( MP4_Box_t *p_atom, unsigned i_tracks )
diff --git a/modules/demux/mp4/fragments.h b/modules/demux/mp4/fragments.h
index a4f84c9..b8ec4ff 100644
--- a/modules/demux/mp4/fragments.h
+++ b/modules/demux/mp4/fragments.h
@@ -20,10 +20,6 @@
 #ifndef VLC_MP4_FRAGMENTS_H_
 #define VLC_MP4_FRAGMENTS_H_
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include "libmp4.h"
 
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 25aa2ea..d08859e 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -19,7 +19,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-
 #ifndef VLC_MP4_LIBMP4_H_
 #define VLC_MP4_LIBMP4_H_
 
diff --git a/modules/demux/mp4/meta.c b/modules/demux/mp4/meta.c
index b597cc3..28bd6f4 100644
--- a/modules/demux/mp4/meta.c
+++ b/modules/demux/mp4/meta.c
@@ -17,6 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "mp4.h"
 
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 3a9317a..5e43258 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -19,19 +19,20 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-
 #include "mp4.h"
 
-#include <vlc_plugin.h>
-
 #include <vlc_demux.h>
 #include <vlc_charset.h>                           /* EnsureUTF8 */
 #include <vlc_input.h>
 #include <vlc_aout.h>
+#include <vlc_plugin.h>
 #include <assert.h>
 #include <limits.h>
 #include "../codec/cc.h"
diff --git a/modules/demux/mp4/mp4.h b/modules/demux/mp4/mp4.h
index 1134d33..9a10c0a 100644
--- a/modules/demux/mp4/mp4.h
+++ b/modules/demux/mp4/mp4.h
@@ -25,10 +25,6 @@
  * Preamble
  *****************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include "libmp4.h"
 #include "fragments.h"
diff --git a/modules/mux/mp4/libmp4mux.c b/modules/mux/mp4/libmp4mux.c
index 10e1d81..8b48b1f 100644
--- a/modules/mux/mp4/libmp4mux.c
+++ b/modules/mux/mp4/libmp4mux.c
@@ -20,16 +20,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "libmp4mux.h"
 #include "../demux/mp4/libmp4.h" /* flags */
 #include "../packetizer/hevc_nal.h"
 #include "../packetizer/h264_nal.h" /* h264_get_spspps */
 #include "../packetizer/hxxx_nal.h"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_es.h>
 #include <vlc_iso_lang.h>
 #include <vlc_bits.h>
diff --git a/modules/mux/mp4/libmp4mux.h b/modules/mux/mp4/libmp4mux.h
index 2b45999..d6d6532 100644
--- a/modules/mux/mp4/libmp4mux.h
+++ b/modules/mux/mp4/libmp4mux.h
@@ -20,10 +20,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_es.h>
 #include <vlc_boxes.h>
diff --git a/modules/mux/mp4/mp4.c b/modules/mux/mp4/mp4.c
index bcc2ac7..e0e29b1 100644
--- a/modules/mux/mp4/mp4.c
+++ b/modules/mux/mp4/mp4.c
@@ -21,15 +21,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>