diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-11-03 23:11:36 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-11-03 23:11:36 (GMT) |
| commit | 459f802837d25548cd1a248ff0bc5181344b4367 (patch) | |
| tree | 880d8d2b47c8b47437c3e8ddf6c167e59c2a1b3b /src/xine-lib-4-mng.patch | |
| parent | 4d17c8df490538b78748ac5249e67e1719a1ef1b (diff) | |
| download | mxe-459f802837d25548cd1a248ff0bc5181344b4367.zip mxe-459f802837d25548cd1a248ff0bc5181344b4367.tar.gz mxe-459f802837d25548cd1a248ff0bc5181344b4367.tar.bz2 | |
package xine-lib: fix mng support
Diffstat (limited to 'src/xine-lib-4-mng.patch')
| -rw-r--r-- | src/xine-lib-4-mng.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/src/xine-lib-4-mng.patch b/src/xine-lib-4-mng.patch new file mode 100644 index 0000000..194eadd --- /dev/null +++ b/src/xine-lib-4-mng.patch @@ -0,0 +1,43 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch taken from: +https://bugs.xine-project.org/show_bug.cgi?id=430 + +From 937ff31c13b06d22a094d6a91d2ae33471f2bc58 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Thu, 3 Nov 2011 23:48:50 +0100 +Subject: [PATCH] fix include order to avoid conflicting INT32 + +basetsd.h and jmorecfg.h both define INT32, but jmorecfg.h checks. +libmng.h introduces jmorecfg.h and so it must follow xine_internal.h +which introduces basetsd.h. +--- + src/demuxers/demux_mng.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c +index 2fccd0b..bf4dfec 100644 +--- a/src/demuxers/demux_mng.c ++++ b/src/demuxers/demux_mng.c +@@ -38,8 +38,6 @@ + #undef HAVE_STDLIB_H + #endif + +-#include <libmng.h> +- + #define LOG_MODULE "demux_mng" + #define LOG_VERBOSE + /* +@@ -50,6 +48,8 @@ + #include "xineutils.h" + #include "demux.h" + ++#include <libmng.h> ++ + typedef struct { + demux_plugin_t demux_plugin; + +-- +1.7.7 + |