Mercurial > mplayer.hg

changeset 11139:970e9c6471f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for compilation on mingw32/cygwin. Patch by Goodwu <goodwu@21cn.com>.
author mosu
date Thu, 16 Oct 2003 07:28:33 +0000
parents afb0bf51b4a6
children 4d6a0bfe770e
files libmpdemux/demux_mkv.cpp
diffstat 1 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mkv.cpp	Thu Oct 16 01:13:37 2003 +0000
+++ b/libmpdemux/demux_mkv.cpp	Thu Oct 16 07:28:33 2003 +0000
@@ -10,22 +10,6 @@
 
 #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 @@
 #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;