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

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Mar  9 17:57:26 2016 +0100| [d6b6f0f064b245b9d68387b75a1ea6fe13e71de4] | committer: Francois Cartegnie

demux: smooth: fix include order

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

 modules/demux/smooth/SmoothManager.cpp              |    4 ++--
 modules/demux/smooth/SmoothStream.cpp               |    4 ++++
 modules/demux/smooth/SmoothStream.hpp               |    4 ----
 modules/demux/smooth/mp4/IndexReader.cpp            |    4 ++++
 modules/demux/smooth/playlist/ForgedInitSegment.cpp |    8 ++++----
 modules/demux/smooth/playlist/ForgedInitSegment.hpp |    4 ----
 modules/demux/smooth/playlist/MemoryChunk.cpp       |    4 ++++
 modules/demux/smooth/playlist/Parser.cpp            |    4 ++++
 modules/demux/smooth/playlist/Parser.hpp            |    4 ----
 modules/demux/smooth/playlist/Representation.cpp    |    4 ++++
 modules/demux/smooth/playlist/SmoothSegment.cpp     |    3 +++
 11 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/modules/demux/smooth/SmoothManager.cpp b/modules/demux/smooth/SmoothManager.cpp
index c592e8f6..5cd5cff 100644
--- a/modules/demux/smooth/SmoothManager.cpp
+++ b/modules/demux/smooth/SmoothManager.cpp
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include "SmoothManager.hpp"
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include "SmoothManager.hpp"
+
 #include "../adaptive/tools/Retrieve.hpp"
 #include "playlist/Parser.hpp"
 #include "../adaptive/xml/DOMParser.h"
diff --git a/modules/demux/smooth/SmoothStream.cpp b/modules/demux/smooth/SmoothStream.cpp
index 731304b..fd1b0ee 100644
--- a/modules/demux/smooth/SmoothStream.cpp
+++ b/modules/demux/smooth/SmoothStream.cpp
@@ -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 "SmoothStream.hpp"
 #include <vlc_demux.h>
 
diff --git a/modules/demux/smooth/SmoothStream.hpp b/modules/demux/smooth/SmoothStream.hpp
index 5aee3f8..07e95df 100644
--- a/modules/demux/smooth/SmoothStream.hpp
+++ b/modules/demux/smooth/SmoothStream.hpp
@@ -20,10 +20,6 @@
 #ifndef SMOOTHSTREAM_HPP
 #define SMOOTHSTREAM_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "../adaptive/Streams.hpp"
 
 namespace smooth
diff --git a/modules/demux/smooth/mp4/IndexReader.cpp b/modules/demux/smooth/mp4/IndexReader.cpp
index 7246158..f8c6d7b 100644
--- a/modules/demux/smooth/mp4/IndexReader.cpp
+++ b/modules/demux/smooth/mp4/IndexReader.cpp
@@ -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 "IndexReader.hpp"
 #include "../adaptive/playlist/BaseRepresentation.h"
 #include "../adaptive/playlist/BaseAdaptationSet.h"
diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.cpp b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
index 34a05a6..646267b 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.cpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include "ForgedInitSegment.hpp"
-#include "MemoryChunk.hpp"
-#include "../adaptive/playlist/SegmentChunk.hpp"
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include "ForgedInitSegment.hpp"
+#include "MemoryChunk.hpp"
+#include "../adaptive/playlist/SegmentChunk.hpp"
+
 #include <vlc_common.h>
 
 #include <cstdlib>
diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.hpp b/modules/demux/smooth/playlist/ForgedInitSegment.hpp
index 933d2a6..63ecca3 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.hpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.hpp
@@ -23,10 +23,6 @@
 #include "../adaptive/playlist/Segment.h"
 #include "../adaptive/playlist/Inheritables.hpp"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_codecs.h>
 
 namespace smooth
diff --git a/modules/demux/smooth/playlist/MemoryChunk.cpp b/modules/demux/smooth/playlist/MemoryChunk.cpp
index 8c65572..08890f5 100644
--- a/modules/demux/smooth/playlist/MemoryChunk.cpp
+++ b/modules/demux/smooth/playlist/MemoryChunk.cpp
@@ -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 "MemoryChunk.hpp"
 
 #include <vlc_block.h>
diff --git a/modules/demux/smooth/playlist/Parser.cpp b/modules/demux/smooth/playlist/Parser.cpp
index 1167b3c..cc2be84 100644
--- a/modules/demux/smooth/playlist/Parser.cpp
+++ b/modules/demux/smooth/playlist/Parser.cpp
@@ -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 "Parser.hpp"
 
 #include "Manifest.hpp"
diff --git a/modules/demux/smooth/playlist/Parser.hpp b/modules/demux/smooth/playlist/Parser.hpp
index 4ec1dd4..5c59f79 100644
--- a/modules/demux/smooth/playlist/Parser.hpp
+++ b/modules/demux/smooth/playlist/Parser.hpp
@@ -20,10 +20,6 @@
 #ifndef MANIFESTPARSER_HPP
 #define MANIFESTPARSER_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "../adaptive/playlist/SegmentInfoCommon.h"
 
 #include <cstdlib>
diff --git a/modules/demux/smooth/playlist/Representation.cpp b/modules/demux/smooth/playlist/Representation.cpp
index c264525..58234cb 100644
--- a/modules/demux/smooth/playlist/Representation.cpp
+++ b/modules/demux/smooth/playlist/Representation.cpp
@@ -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 "Representation.hpp"
 #include "Manifest.hpp"
 #include "../adaptive/playlist/SegmentTemplate.h"
diff --git a/modules/demux/smooth/playlist/SmoothSegment.cpp b/modules/demux/smooth/playlist/SmoothSegment.cpp
index 858ee42..186258b 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.cpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.cpp
@@ -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 "SmoothSegment.hpp"