summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/asfheader.h5
-rw-r--r--src/libffmpeg/libavcodec/Makefile.am5
-rw-r--r--src/libffmpeg/libavcodec/alpha/Makefile.am2
-rw-r--r--src/libffmpeg/libavcodec/armv4l/Makefile.am3
-rw-r--r--src/libffmpeg/libavcodec/i386/Makefile.am3
-rw-r--r--src/libffmpeg/libavcodec/libpostproc/Makefile.am3
-rw-r--r--src/libffmpeg/libavcodec/mlib/Makefile.am2
-rw-r--r--src/libffmpeg/libavcodec/ppc/Makefile.am2
-rw-r--r--src/libffmpeg/libavcodec/sparc/Makefile.am3
-rw-r--r--src/libffmpeg/libavutil/Makefile.am2
-rw-r--r--src/post/audio/filter.c3
-rw-r--r--src/post/audio/window.c3
-rw-r--r--src/post/goom/convolve_fx.c4
-rw-r--r--src/post/goom/diff_against_release.patch26
-rw-r--r--src/post/goom/goom_config.h4
-rw-r--r--src/xine-engine/Makefile.am2
-rw-r--r--src/xine-engine/load_plugins.c5
-rw-r--r--src/xine-engine/xine.c5
-rw-r--r--src/xine-utils/Makefile.am1
-rw-r--r--src/xine-utils/xineutils.h31
20 files changed, 65 insertions, 49 deletions
diff --git a/src/demuxers/asfheader.h b/src/demuxers/asfheader.h
index 0a73a2570..2f2fd6705 100644
--- a/src/demuxers/asfheader.h
+++ b/src/demuxers/asfheader.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: asfheader.h,v 1.4 2005/01/12 00:05:36 tmattern Exp $
+ * $Id: asfheader.h,v 1.5 2006/04/08 16:42:24 valtri Exp $
*
* demultiplexer for asf streams
*
@@ -109,8 +109,9 @@
#define ASF_MAX_NUM_STREAMS 23
-#ifndef GUID_DEFINED
+#if !defined(GUID_DEFINED) && !defined(_GUID_DEFINED)
#define GUID_DEFINED
+#define _GUID_DEFINED
typedef struct _GUID { /* size is 16 */
uint32_t Data1;
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index 34a6b522b..53db0d604 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -9,8 +9,9 @@ EXTRA_DIST = motion_est_template.c \
# we need to compile everything in debug mode, including the encoders,
# otherwise we get unresolved symbols, because some unsatisfied function calls
# are not optimized away with debug optimization
-AM_CFLAGS = $(LIBFFMPEG_CFLAGS) `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS`
-AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil
+AM_CFLAGS = `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS`
+AM_CPPFLAGS = $(ZLIB_CPPFLAGS) $(LIBFFMPEG_CPPFLAGS) \
+ -I$(top_srcdir)/src/libffmpeg/libavutil
ASFLAGS =
noinst_LTLIBRARIES = libavcodec.la
diff --git a/src/libffmpeg/libavcodec/alpha/Makefile.am b/src/libffmpeg/libavcodec/alpha/Makefile.am
index b7bb5f7ca..f0df03d75 100644
--- a/src/libffmpeg/libavcodec/alpha/Makefile.am
+++ b/src/libffmpeg/libavcodec/alpha/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
+AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS)
EXTRA_DIST = asm.h \
dsputil_alpha.c \
diff --git a/src/libffmpeg/libavcodec/armv4l/Makefile.am b/src/libffmpeg/libavcodec/armv4l/Makefile.am
index 194cba8eb..a67ef8ea8 100644
--- a/src/libffmpeg/libavcodec/armv4l/Makefile.am
+++ b/src/libffmpeg/libavcodec/armv4l/Makefile.am
@@ -1,6 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = -O2 $(LIBFFMPEG_CFLAGS)
+AM_CFLAGS = -O2
+AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS)
ASFLAGS =
noinst_LTLIBRARIES = libavcodec_armv4l.la
diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am
index 49df37f80..35c2dc5be 100644
--- a/src/libffmpeg/libavcodec/i386/Makefile.am
+++ b/src/libffmpeg/libavcodec/i386/Makefile.am
@@ -2,10 +2,11 @@ include $(top_srcdir)/misc/Makefile.common
# -fomit-frame-pointer is always needed. it might cause debug to not
# work, but at least it compiles.
-AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil -fomit-frame-pointer
+AM_CFLAGS = -fomit-frame-pointer
# CFLAGS is here to filter out -funroll-loops because it causes bad
# behavior of libavcodec
CFLAGS := `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
+AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil
# Avoid "can't find register" failures with -O1 and higher
dsputil_mmx.o dsputil_mmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-funroll-loops//g; s/-O[0-9]/-Os/g'`
diff --git a/src/libffmpeg/libavcodec/libpostproc/Makefile.am b/src/libffmpeg/libavcodec/libpostproc/Makefile.am
index febb2ee85..7b0c2d484 100644
--- a/src/libffmpeg/libavcodec/libpostproc/Makefile.am
+++ b/src/libffmpeg/libavcodec/libpostproc/Makefile.am
@@ -2,7 +2,8 @@ include $(top_srcdir)/misc/Makefile.common
# -fomit-frame-pointer is always needed. it might cause debug to not
# work, but at least it compiles.
-AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -I$(top_srcdir)/src/libffmpeg/libavcodec -fomit-frame-pointer
+AM_CFLAGS = -fomit-frame-pointer
+AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavcodec
ASFLAGS =
noinst_LTLIBRARIES = libpostprocess.la
diff --git a/src/libffmpeg/libavcodec/mlib/Makefile.am b/src/libffmpeg/libavcodec/mlib/Makefile.am
index 69e9ed245..12b022d19 100644
--- a/src/libffmpeg/libavcodec/mlib/Makefile.am
+++ b/src/libffmpeg/libavcodec/mlib/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
+AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS)
ASFLAGS =
noinst_LTLIBRARIES = libavcodec_mlib.la
diff --git a/src/libffmpeg/libavcodec/ppc/Makefile.am b/src/libffmpeg/libavcodec/ppc/Makefile.am
index 0fab4b916..3f9edaa25 100644
--- a/src/libffmpeg/libavcodec/ppc/Makefile.am
+++ b/src/libffmpeg/libavcodec/ppc/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
+AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS)
# CFLAGS is here to filter out -funroll-loops because it causes bad
# behavior of libavcodec
CFLAGS = `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
diff --git a/src/libffmpeg/libavcodec/sparc/Makefile.am b/src/libffmpeg/libavcodec/sparc/Makefile.am
index 7d9777ed5..edf74a9b8 100644
--- a/src/libffmpeg/libavcodec/sparc/Makefile.am
+++ b/src/libffmpeg/libavcodec/sparc/Makefile.am
@@ -1,7 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/src/libffmpeg/libavutil
+AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil
ASFLAGS =
noinst_LTLIBRARIES = libavcodec_sparc.la
diff --git a/src/libffmpeg/libavutil/Makefile.am b/src/libffmpeg/libavutil/Makefile.am
index 67fe1eec1..1edfaa10d 100644
--- a/src/libffmpeg/libavutil/Makefile.am
+++ b/src/libffmpeg/libavutil/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
+AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS)
ASFLAGS =
noinst_LTLIBRARIES = libavutil.la
diff --git a/src/post/audio/filter.c b/src/post/audio/filter.c
index cb0363633..c5602736c 100644
--- a/src/post/audio/filter.c
+++ b/src/post/audio/filter.c
@@ -10,6 +10,9 @@
/* Design and implementation of different types of digital filters */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <string.h>
#include <math.h>
#include "dsp.h"
diff --git a/src/post/audio/window.c b/src/post/audio/window.c
index 23c024668..fdea90590 100644
--- a/src/post/audio/window.c
+++ b/src/post/audio/window.c
@@ -15,6 +15,9 @@
* coefficients will be stored.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <math.h>
#include "dsp.h"
diff --git a/src/post/goom/convolve_fx.c b/src/post/goom/convolve_fx.c
index ccd24dbd6..e86bb3723 100644
--- a/src/post/goom/convolve_fx.c
+++ b/src/post/goom/convolve_fx.c
@@ -7,10 +7,6 @@
#include <stdlib.h>
#include <string.h>
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
//#define CONV_MOTIF_W 32
//#define CONV_MOTIF_WMASK 0x1f
diff --git a/src/post/goom/diff_against_release.patch b/src/post/goom/diff_against_release.patch
index 026cc9862..5bded9393 100644
--- a/src/post/goom/diff_against_release.patch
+++ b/src/post/goom/diff_against_release.patch
@@ -361,17 +361,6 @@ diff -u -p -r1.13 goom_core.c
diff -r -u xine-lib-1.1.0-orig/src/post/goom/convolve_fx.c xine-lib-1.1.0/src/post/goom/convolve_fx.c
--- convolve_fx.c 2005-07-22 12:42:00.000000000 -0400
+++ convolve_fx.c 2005-11-11 14:59:39.925112333 -0500
-@@ -7,6 +7,10 @@
- #include <stdlib.h>
- #include <string.h>
-
-+#if HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- //#define CONV_MOTIF_W 32
- //#define CONV_MOTIF_WMASK 0x1f
-
@@ -151,7 +155,8 @@
ytex = yprime + yi + CONV_MOTIF_W * 0x10000 / 2;
yprime += c;
@@ -494,3 +483,18 @@ diff -r -u xine-lib-1.1.0-orig/src/post/goom/xmmx.c xine-lib-1.1.0/src/post/goom
}
#define DRAWMETHOD_PLUS_XMMX(_out,_backbuf,_col) \
+Index: goom_config.h
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/post/goom/goom_config.h,v
+retrieving revision 1.9
+diff -u -p -r1.9 goom_config.h
+--- goom_config.h 21 Nov 2004 15:10:40 -0000 1.9
++++ goom_config.h 8 Apr 2006 15:35:01 -0000
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #if WORDS_BIGENDIAN
+ #define COLOR_ARGB
+ #else
diff --git a/src/post/goom/goom_config.h b/src/post/goom/goom_config.h
index 5f6f15893..44c4d7d81 100644
--- a/src/post/goom/goom_config.h
+++ b/src/post/goom/goom_config.h
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#if WORDS_BIGENDIAN
#define COLOR_ARGB
#else
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 18f3541b5..8bd404993 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
include $(top_srcdir)/lib/Makefile.common
AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS)
-AM_CPPFLAGS = $(ZLIB_CPPFLAGS)
+AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE
LIBTOOL = $(SHELL) $(top_builddir)/libtool
lib_LTLIBRARIES = libxine.la
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 0bca4bd4e..3a7302ef9 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2005 the xine project
+ * Copyright (C) 2000-2006 the xine project
*
* This file is part of xine, a free video player.
*
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: load_plugins.c,v 1.220 2006/02/14 18:47:46 dsalt Exp $
+ * $Id: load_plugins.c,v 1.221 2006/04/08 16:42:37 valtri Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -39,6 +39,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <stdio.h>
#include <ctype.h>
#include <signal.h>
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 8dac5c264..99c46d1e3 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2005 the xine project
+ * Copyright (C) 2000-2006 the xine project
*
* This file is part of xine, a free video player.
*
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine.c,v 1.322 2006/03/17 18:52:04 hadess Exp $
+ * $Id: xine.c,v 1.323 2006/04/08 16:42:37 valtri Exp $
*/
/*
@@ -36,6 +36,7 @@
#include <stdlib.h>
#include <pthread.h>
#include <stdarg.h>
+#include <stdio.h>
#if defined (__linux__)
#include <endian.h>
#elif defined (__FreeBSD__)
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index 6e22f0ab2..d4f37ceea 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -12,6 +12,7 @@ endif
endif
AM_CFLAGS = $(X_CFLAGS)
+AM_CPPFLAGS=-DXINE_LIBRARY_COMPILE
libxineutils_la_SOURCES = $(pppc_files) \
cpu_accel.c \
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 4f3542154..c3b56c8c7 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2005 the xine project
+ * Copyright (C) 2000-2006 the xine project
*
* This file is part of xine, a free video player.
*
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xineutils.h,v 1.100 2006/02/14 19:12:16 dsalt Exp $
+ * $Id: xineutils.h,v 1.101 2006/04/08 16:42:38 valtri Exp $
*
*/
#ifndef XINEUTILS_H
@@ -65,9 +65,14 @@ extern "C" {
#include <stdio.h>
#include <string.h>
-/* for alloca under MinGW */
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
+
+/*
+ * Mark exported data symbols for link engine library clients with older
+ * Win32 compilers
+ */
+#if defined(WIN32) && !defined(XINE_LIBRARY_COMPILE)
+# define DL_IMPORT __declspec(dllimport)
+# define extern DL_IMPORT extern
#endif
/*
@@ -595,18 +600,7 @@ typedef union {
/* Optimized/fast memcpy */
-/*
- TODO : fix dll linkage problem for xine_fast_memcpy on win32
-
- xine_fast_memcpy dll linkage is screwy here.
- declaring as dllimport seems to fix the problem
- but causes compiler warning with libxineutils
-*/
-#ifdef _MSC_VER
-__declspec( dllimport ) extern void *(* xine_fast_memcpy)(void *to, const void *from, size_t len);
-#else
extern void *(* xine_fast_memcpy)(void *to, const void *from, size_t len);
-#endif
#ifdef HAVE_XINE_INTERNAL_H
/* Benchmark available memcpy methods */
@@ -978,6 +972,11 @@ const char *xine_guess_spu_encoding(void);
*/
int xine_monotonic_clock(struct timeval *tv, struct timezone *tz);
+/* don't harm following code */
+#ifdef extern
+# undef extern
+#endif
+
#ifdef __cplusplus
}
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 14:55:36 +0000