Mkv: kill warnings.

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index a32f041350d558b5a0e3942d970149584c79e479..91cf2cad59772c818f708d152a95f5467d7a8b93 100644 (file)
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -28,6 +28,13 @@
 
 #include "demux.hpp"
 
+/* GetFourCC helper */
+#define GetFOURCC( p )  __GetFOURCC( (uint8_t*)p )
+static vlc_fourcc_t __GetFOURCC( uint8_t *p )
+{
+    return VLC_FOURCC( p[0], p[1], p[2], p[3] );
+}
+
 /* Destructor */
 matroska_segment_c::~matroska_segment_c()
 {

diff --git a/modules/demux/mkv/matroska_segment.hpp b/modules/demux/mkv/matroska_segment.hpp
index cd0d717f79cb8c3a8ea7ef4bf20f9fa78d8d1a63..5347e75f319d689b951eaea36eed6e834ad35945 100644 (file)
--- a/modules/demux/mkv/matroska_segment.hpp
+++ b/modules/demux/mkv/matroska_segment.hpp
@@ -27,6 +27,7 @@
 
 #include "mkv.hpp"
 
+
 #include "Ebml_parser.hpp"
 
 class chapter_edition_c;

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index bd75f2fe75f6b0864b2b57ba16e1bcfa10865f7c..8933f34ace1e157a3b3be258d730eb40606cba6f 100644 (file)
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -28,6 +28,14 @@
 
 #include "demux.hpp"
 
+/*****************************************************************************
+ * Some functions to manipulate memory
+ *****************************************************************************/
+static inline char * ToUTF8( const UTFstring &u )
+{
+    return strdup( u.GetUTF8().c_str() );
+}
+
 /*****************************************************************************
  * ParseSeekHead:
  *****************************************************************************/

diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index b211889a178d37bb9ba6eeeff1bfd2d6e51f62fb..35db8af87093284edf8f3e9d4d96cf14bd06e466 100644 (file)
--- a/modules/demux/mkv/mkv.hpp
+++ b/modules/demux/mkv/mkv.hpp
@@ -131,19 +131,6 @@ extern "C" {
 
 #define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId )
 
-/*****************************************************************************
- * Some functions to manipulate memory
- *****************************************************************************/
-#define GetFOURCC( p )  __GetFOURCC( (uint8_t*)p )
-static vlc_fourcc_t __GetFOURCC( uint8_t *p )
-{
-    return VLC_FOURCC( p[0], p[1], p[2], p[3] );
-}
-static inline char * ToUTF8( const UTFstring &u )
-{
-    return strdup( u.GetUTF8().c_str() );
-}
-
 
 using namespace LIBMATROSKA_NAMESPACE;
 using namespace std;