aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-02-05 15:04:49 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-02-05 15:04:49 +0000
commit8bbb2068bae2d03a574ff594b6cd791370e0de58 (patch)
tree4770083104597336d2650e95381518ac32627eb7
parent0d445e4ef186d6daee3a1545609a1528fe31fa10 (diff)
downloadusdx-8bbb2068bae2d03a574ff594b6cd791370e0de58.tar.gz
usdx-8bbb2068bae2d03a574ff594b6cd791370e0de58.tar.xz
usdx-8bbb2068bae2d03a574ff594b6cd791370e0de58.zip
- 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
-rw-r--r--Game/Code/config-win.inc2
-rw-r--r--Game/Code/lib/ffmpeg/swscale.pas2
2 files changed, 2 insertions, 2 deletions
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 *)