From 8bbb2068bae2d03a574ff594b6cd791370e0de58 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 5 Feb 2008 15:04:49 +0000 Subject: - config-win.pas: swscale must be undefined by default - swscale.pas: corrected "config" to "UConfig" git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@817 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/config-win.inc | 2 +- Game/Code/lib/ffmpeg/swscale.pas | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Game') diff --git a/Game/Code/config-win.inc b/Game/Code/config-win.inc index 5791c579..749575ec 100644 --- a/Game/Code/config-win.inc +++ b/Game/Code/config-win.inc @@ -32,7 +32,7 @@ LIBAVUTIL_VERSION_RELEASE = 0; {$IFEND} -{$DEFINE HaveSWScale} +{$UNDEF HaveSWScale} {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} sw__scale = 'swscale-0'; LIBSWSCALE_VERSION_MAJOR = 0; diff --git a/Game/Code/lib/ffmpeg/swscale.pas b/Game/Code/lib/ffmpeg/swscale.pas index 406ab4a9..9bff330a 100644 --- a/Game/Code/lib/ffmpeg/swscale.pas +++ b/Game/Code/lib/ffmpeg/swscale.pas @@ -37,7 +37,7 @@ interface uses avutil, - config; + UConfig; const (* Max. supported version by this header *) -- cgit v1.2.3