From 8dc253dad613fa9408f0a0ccb674e9e77ddef767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sat, 8 Apr 2006 16:42:23 +0000 Subject: Ancient platforms support: - rint, lrint, M_PI (ffmpeg and goom) - avoid mkdir warnings - check for older _GUID_DEFINED too - ressurected generating inttypes, cleaned public os_types.h - moved function redefiniton used only in the old MSVC to central place Windows port update: - build internal ffmpeg: - workaround 'near' keyword problem - proper using __declspec(dllimport) Other changes: - LIBFFMPEG_CFLAGS --> LIBFFMPEG_CPPFLAGS CVS patchset: 7964 CVS date: 2006/04/08 16:42:23 --- src/post/goom/diff_against_release.patch | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'src/post/goom/diff_against_release.patch') 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 - #include - -+#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 -- cgit v1.2.3