From 115255f6a3c2be422680710b5d6ba4226c3383a6 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 15 Jun 2010 21:28:52 +0000
Subject: merged trunk r2528 into us_maker branch

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

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

diff --git a/us_maker_edition/src/config-win.inc b/us_maker_edition/src/config-win.inc
index 72e00aef..843fdb0e 100644
--- a/us_maker_edition/src/config-win.inc
+++ b/us_maker_edition/src/config-win.inc
@@ -8,26 +8,26 @@
 {$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)}
   av__codec = 'avcodec-52';
   LIBAVCODEC_VERSION_MAJOR   = 52;
-  LIBAVCODEC_VERSION_MINOR   = 45;
-  LIBAVCODEC_VERSION_RELEASE = 0;
+  LIBAVCODEC_VERSION_MINOR   = 67;
+  LIBAVCODEC_VERSION_RELEASE = 2;
 
   av__format = 'avformat-52';
   LIBAVFORMAT_VERSION_MAJOR   = 52;
-  LIBAVFORMAT_VERSION_MINOR   = 46;
+  LIBAVFORMAT_VERSION_MINOR   = 62;
   LIBAVFORMAT_VERSION_RELEASE = 0;
 
   av__util = 'avutil-50';
   LIBAVUTIL_VERSION_MAJOR   = 50;
-  LIBAVUTIL_VERSION_MINOR   = 7;
-  LIBAVUTIL_VERSION_RELEASE = 0;
+  LIBAVUTIL_VERSION_MINOR   = 15;
+  LIBAVUTIL_VERSION_RELEASE = 2;
 {$IFEND}
 
 {$DEFINE HaveSWScale}
 {$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
   sw__scale = 'swscale-0';
   LIBSWSCALE_VERSION_MAJOR   = 0;
-  LIBSWSCALE_VERSION_MINOR   = 7;
-  LIBSWSCALE_VERSION_RELEASE = 2;
+  LIBSWSCALE_VERSION_MINOR   = 10;
+  LIBSWSCALE_VERSION_RELEASE = 0;
 {$IFEND}
 
 {$DEFINE HaveProjectM}
-- 
cgit v1.2.3