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

[Francois Cartegnie]

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

demux: hls: fix include order

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

 modules/demux/hls/HLSStreams.cpp          |    4 ++++
 modules/demux/hls/HLSStreams.hpp          |    4 ----
 modules/demux/hls/playlist/HLSSegment.cpp |    4 ++++
 modules/demux/hls/playlist/HLSSegment.hpp |    4 ----
 modules/demux/hls/playlist/Parser.hpp     |    4 ----
 modules/demux/hls/playlist/Tags.cpp       |    7 ++++---
 modules/demux/hls/playlist/Tags.hpp       |    4 ----
 7 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/modules/demux/hls/HLSStreams.cpp b/modules/demux/hls/HLSStreams.cpp
index 423abe8..92a4c5d 100644
--- a/modules/demux/hls/HLSStreams.cpp
+++ b/modules/demux/hls/HLSStreams.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 "HLSStreams.hpp"
 #include <vlc_demux.h>
 
diff --git a/modules/demux/hls/HLSStreams.hpp b/modules/demux/hls/HLSStreams.hpp
index 2366d16..2038a0d 100644
--- a/modules/demux/hls/HLSStreams.hpp
+++ b/modules/demux/hls/HLSStreams.hpp
@@ -20,10 +20,6 @@
 #ifndef HLSSTREAM_HPP
 #define HLSSTREAM_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "../adaptive/Streams.hpp"
 
 namespace hls
diff --git a/modules/demux/hls/playlist/HLSSegment.cpp b/modules/demux/hls/playlist/HLSSegment.cpp
index c17675c..bbd28f8 100644
--- a/modules/demux/hls/playlist/HLSSegment.cpp
+++ b/modules/demux/hls/playlist/HLSSegment.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 "HLSSegment.hpp"
 #include "../adaptive/playlist/SegmentChunk.hpp"
 #include "../adaptive/playlist/BaseRepresentation.h"
diff --git a/modules/demux/hls/playlist/HLSSegment.hpp b/modules/demux/hls/playlist/HLSSegment.hpp
index a4c62b7..f4c18d7 100644
--- a/modules/demux/hls/playlist/HLSSegment.hpp
+++ b/modules/demux/hls/playlist/HLSSegment.hpp
@@ -20,10 +20,6 @@
 #ifndef HLSSEGMENT_HPP
 #define HLSSEGMENT_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "../adaptive/playlist/Segment.h"
 #include <vector>
 #ifdef HAVE_GCRYPT
diff --git a/modules/demux/hls/playlist/Parser.hpp b/modules/demux/hls/playlist/Parser.hpp
index 6b12f02..9fd6bcd 100644
--- a/modules/demux/hls/playlist/Parser.hpp
+++ b/modules/demux/hls/playlist/Parser.hpp
@@ -20,10 +20,6 @@
 #ifndef PARSER_HPP
 #define PARSER_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "../adaptive/playlist/SegmentInfoCommon.h"
 
 #include <cstdlib>
diff --git a/modules/demux/hls/playlist/Tags.cpp b/modules/demux/hls/playlist/Tags.cpp
index edce0ee..6ff0293 100644
--- a/modules/demux/hls/playlist/Tags.cpp
+++ b/modules/demux/hls/playlist/Tags.cpp
@@ -17,13 +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.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "Tags.hpp"
 #include <sstream>
 #include <stack>
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <vlc_common.h>
 
 using namespace hls::playlist;
diff --git a/modules/demux/hls/playlist/Tags.hpp b/modules/demux/hls/playlist/Tags.hpp
index 259215f..e919513 100644
--- a/modules/demux/hls/playlist/Tags.hpp
+++ b/modules/demux/hls/playlist/Tags.hpp
@@ -20,10 +20,6 @@
 #ifndef TAGS_HPP
 #define TAGS_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdint.h>
 
 #include <string>