Useless vlc_codecs.h includes

[vlc] / modules / demux / mkv / mkv.hpp

diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index b211889a178d37bb9ba6eeeff1bfd2d6e51f62fb..76407db2c122b9f4707d34080355483136310afa 100644 (file)
--- a/modules/demux/mkv/mkv.hpp
+++ b/modules/demux/mkv/mkv.hpp
@@ -34,6 +34,7 @@
  * early enough. */
 #define __STDC_FORMAT_MACROS 1
 #define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -48,10 +49,8 @@
 #   include <time.h>                                               /* time() */
 #endif
 
-
-#include <vlc_codecs.h>               /* BITMAPINFOHEADER, WAVEFORMATEX */
 #include <vlc_iso_lang.h>
-#include "vlc_meta.h"
+#include <vlc_meta.h>
 #include <vlc_charset.h>
 #include <vlc_input.h>
 #include <vlc_demux.h>
@@ -102,7 +101,7 @@
 
 #include "ebml/StdIOCallback.h"
 
-#include "vlc_keys.h"
+#include <vlc_keys.h>
 
 extern "C" {
    #include "../mp4/libmp4.h"
@@ -119,35 +118,15 @@ extern "C" {
 
 #define MKVD_TIMECODESCALE 1000000
 
-/**
- * What's between a directory and a filename?
- */
-#if defined( WIN32 )
-    #define DIRECTORY_SEPARATOR '\\'
-#else
-    #define DIRECTORY_SEPARATOR '/'
-#endif
-
-
 #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;
 
+void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock,
+                         mtime_t i_pts, mtime_t i_duration, bool f_mandatory );
+
 class attachment_c
 {
 public:
@@ -207,6 +186,7 @@ typedef struct
     uint8_t      *p_extra_data;
 
     char         *psz_codec;
+    bool         b_dts_only;
 
     uint64_t     i_default_duration;
     float        f_timecodescale;