From 9e7a37fb651c3b3bb0a6ffdd29b1c7735c3a622c Mon Sep 17 00:00:00 2001
From: basisbit <basisbit@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 15 Aug 2015 16:03:35 +0000
Subject: *raised LogFileLevel for development/debugging purposes to 50 *fixed
 compiling for windows *updated windows-build to most recent ffmpeg v2.7
 version and fixed IPath for UVideo.TVideoPlayback_FFmpeg.Open according to
 v2.7 ffmpeg documentation

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3121 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/config-win.inc | 57 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 23 deletions(-)

(limited to 'src/config-win.inc')

diff --git a/src/config-win.inc b/src/config-win.inc
index 826e3864..e8932b7a 100644
--- a/src/config-win.inc
+++ b/src/config-win.inc
@@ -6,40 +6,51 @@
 
 {$IF Defined(IncludeConstants)}
   LUA_LIB_NAME        = 'lua';
-  LUA_VERSION_INT     = 5001004;
-  LUA_VERSION_RELEASE = '4';
+  LUA_VERSION_INT     = 5001005;
+  LUA_VERSION_RELEASE = '5';
   LUA_VERSION_MINOR   = '1';
   LUA_VERSION_MAJOR   = '5';
-  LUA_VERSION         = '5.1.4';
+  LUA_VERSION         = '5.1.5';
 {$IFEND}
 
 {$DEFINE HaveFFmpeg}
+//the required DLLs can be downloaded here: https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-20150814-git-affbecb-win32-shared.7z
+{$IF Defined(HaveFFmpeg)}
+  {$MACRO ON}
+  {$IFNDEF FFMPEG_DIR}
+    {$IF (4 > 0) or (2 > 0)}
+      {$DEFINE FFMPEG_DIR := 'ffmpeg-2.7'}
+      {$DEFINE FF_API_OLD_DECODE_AUDIO}
+    {$ELSE}
+      {$DEFINE FFMPEG_DIR := 'ffmpeg'}
+      {$DEFINE useOLD_FFMPEG}
+    {$IFEND}
+  {$ENDIF}
+  {$IF Defined(IncludeConstants)}
+    FFMPEG_VERSION_INT = 2007000;
+    av__codec = 'avcodec-56';
+    LIBAVCODEC_VERSION_MAJOR   = 56;
+    LIBAVCODEC_VERSION_MINOR   = 57;
+    LIBAVCODEC_VERSION_RELEASE = 100;
 
-{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)}
-  FFMPEG_DIR          = 'ffmpeg';
-  
-  av__codec = 'avcodec-52';
-  LIBAVCODEC_VERSION_MAJOR   = 52;
-  LIBAVCODEC_VERSION_MINOR   = 67;
-  LIBAVCODEC_VERSION_RELEASE = 2;
+    av__format = 'avformat-56';
+    LIBAVFORMAT_VERSION_MAJOR   = 56;
+    LIBAVFORMAT_VERSION_MINOR   = 40;
+    LIBAVFORMAT_VERSION_RELEASE = 101;
 
-  av__format = 'avformat-52';
-  LIBAVFORMAT_VERSION_MAJOR   = 52;
-  LIBAVFORMAT_VERSION_MINOR   = 62;
-  LIBAVFORMAT_VERSION_RELEASE = 0;
-
-  av__util = 'avutil-50';
-  LIBAVUTIL_VERSION_MAJOR   = 50;
-  LIBAVUTIL_VERSION_MINOR   = 15;
-  LIBAVUTIL_VERSION_RELEASE = 2;
+    av__util = 'avutil-54';
+    LIBAVUTIL_VERSION_MAJOR   = 54;
+    LIBAVUTIL_VERSION_MINOR   = 30;
+    LIBAVUTIL_VERSION_RELEASE = 100;
+  {$IFEND}
 {$IFEND}
 
 {$DEFINE HaveSWScale}
 {$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
-  sw__scale = 'swscale-0';
-  LIBSWSCALE_VERSION_MAJOR   = 0;
-  LIBSWSCALE_VERSION_MINOR   = 10;
-  LIBSWSCALE_VERSION_RELEASE = 0;
+  sw__scale = 'swscale-3';
+  LIBSWSCALE_VERSION_MAJOR   = 3;
+  LIBSWSCALE_VERSION_MINOR   = 1;
+  LIBSWSCALE_VERSION_RELEASE = 101;
 {$IFEND}
 
 {$DEFINE HaveProjectM}
-- 
cgit v1.2.3