Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv20468 Modified Files: demux_mkv.cpp Log Message: Fix for compilation on mingw32/cygwin. Patch by Goodwu <goodwu@21cn.com>. Index: demux_mkv.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- demux_mkv.cpp 14 Oct 2003 13:45:31 -0000 1.36 +++ demux_mkv.cpp 16 Oct 2003 07:28:33 -0000 1.37 @@ -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> @@ -53,6 +37,22 @@ #include <matroska/KaxTrackVideo.h> #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"