From 678cc132f942ff4d84a803550eedf96acc543bca Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 23 May 2010 09:07:15 +0000
Subject: update to trunk rev. 2391

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2401 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 cmake/src/config-win.inc | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

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

diff --git a/cmake/src/config-win.inc b/cmake/src/config-win.inc
index e3ca8840..72e00aef 100644
--- a/cmake/src/config-win.inc
+++ b/cmake/src/config-win.inc
@@ -1,4 +1,4 @@
-{***************************************************************** 
+{*****************************************************************
  * Configuration file for UltraStar Deluxe 1.1
  *****************************************************************}
 
@@ -6,28 +6,28 @@
 
 {$DEFINE HaveFFmpeg}
 {$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)}
-  av__codec = 'avcodec-51';
-  LIBAVCODEC_VERSION_MAJOR   = 51;
-  LIBAVCODEC_VERSION_MINOR   = 16;
+  av__codec = 'avcodec-52';
+  LIBAVCODEC_VERSION_MAJOR   = 52;
+  LIBAVCODEC_VERSION_MINOR   = 45;
   LIBAVCODEC_VERSION_RELEASE = 0;
 
-  av__format = 'avformat-50';
-  LIBAVFORMAT_VERSION_MAJOR   = 50;
-  LIBAVFORMAT_VERSION_MINOR   = 5;
+  av__format = 'avformat-52';
+  LIBAVFORMAT_VERSION_MAJOR   = 52;
+  LIBAVFORMAT_VERSION_MINOR   = 46;
   LIBAVFORMAT_VERSION_RELEASE = 0;
 
-  av__util = 'avutil-49';
-  LIBAVUTIL_VERSION_MAJOR   = 49;
-  LIBAVUTIL_VERSION_MINOR   = 0;
-  LIBAVUTIL_VERSION_RELEASE = 1;
+  av__util = 'avutil-50';
+  LIBAVUTIL_VERSION_MAJOR   = 50;
+  LIBAVUTIL_VERSION_MINOR   = 7;
+  LIBAVUTIL_VERSION_RELEASE = 0;
 {$IFEND}
 
-{$UNDEF HaveSWScale}
+{$DEFINE HaveSWScale}
 {$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
   sw__scale = 'swscale-0';
   LIBSWSCALE_VERSION_MAJOR   = 0;
-  LIBSWSCALE_VERSION_MINOR   = 5;
-  LIBSWSCALE_VERSION_RELEASE = 0;
+  LIBSWSCALE_VERSION_MINOR   = 7;
+  LIBSWSCALE_VERSION_RELEASE = 2;
 {$IFEND}
 
 {$DEFINE HaveProjectM}
@@ -53,4 +53,3 @@
   LIBSAMPLERATE_VERSION_MINOR   = 1;
   LIBSAMPLERATE_VERSION_RELEASE = 3;
 {$IFEND}
-
-- 
cgit v1.2.3