[vlc-devel] commit: Mkv: kill warnings. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan 26 13:39:18 2009 +0100| [411303f8aef85950d161cb47b9e1ae786065cd89] | committer: Jean-Baptiste Kempf 

Mkv: kill warnings.

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

 modules/demux/mkv/matroska_segment.cpp       |    7 +++++++
 modules/demux/mkv/matroska_segment.hpp       |    1 +
 modules/demux/mkv/matroska_segment_parse.cpp |    8 ++++++++
 modules/demux/mkv/mkv.hpp                    |   13 -------------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index a32f041..91cf2ca 100644
--- 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 cd0d717..5347e75 100644
--- 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 bd75f2f..8933f34 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -29,6 +29,14 @@
 #include "demux.hpp"
 
 /*****************************************************************************
+ * Some functions to manipulate memory
+ *****************************************************************************/
+static inline char * ToUTF8( const UTFstring &u )
+{
+    return strdup( u.GetUTF8().c_str() );
+}
+
+/*****************************************************************************
  * ParseSeekHead:
  *****************************************************************************/
 void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead )
diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index b211889..35db8af 100644
--- 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;