summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authormosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-16 07:28:33 +0000
committermosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-16 07:28:33 +0000
commit285df3df48c2447099a82d33e6dfc3f4eecb0975 (patch)
tree16af0fb19b17845f98db6203c101914b10eb44e6 /libmpdemux
parent78020deb9e4b2c6f9e89defe814a48364e71dfab (diff)
downloadmpv-285df3df48c2447099a82d33e6dfc3f4eecb0975.tar.bz2
mpv-285df3df48c2447099a82d33e6dfc3f4eecb0975.tar.xz
Fix for compilation on mingw32/cygwin. Patch by Goodwu <goodwu@21cn.com>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11140 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mkv.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/libmpdemux/demux_mkv.cpp b/libmpdemux/demux_mkv.cpp
index d66c06768f..8acf3e3f64 100644
--- a/libmpdemux/demux_mkv.cpp
+++ b/libmpdemux/demux_mkv.cpp
@@ -10,22 +10,6 @@ extern "C" {
#ifdef HAVE_MATROSKA
-extern "C" {
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "../mp_msg.h"
-#include "../help_mp.h"
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "../subreader.h"
-#include "../libvo/sub.h"
-
-}
-
#include <vector>
#include <ebml/EbmlHead.h>
@@ -54,6 +38,22 @@ extern "C" {
#include <matroska/KaxTrackEntryData.h>
#include <matroska/FileKax.h>
+extern "C" {
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../mp_msg.h"
+#include "../help_mp.h"
+#include "stream.h"
+#include "demuxer.h"
+#include "stheader.h"
+
+#include "../subreader.h"
+#include "../libvo/sub.h"
+
+}
+
#include "matroska.h"
using namespace libebml;