From 3a42880592166db97707282162b84c97a30cf51f Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 22 Nov 2014 11:49:39 +0000
Subject: adding ffmpeg-2.4. compiles, but crashes on Mac OS X.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3083 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/config-darwin.inc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/src/config-darwin.inc b/src/config-darwin.inc
index edfceb47..8bde009d 100644
--- a/src/config-darwin.inc
+++ b/src/config-darwin.inc
@@ -18,8 +18,8 @@
 {$IF Defined(HaveFFmpeg)}
   {$MACRO ON}
   {$IFNDEF FFMPEG_DIR}
-    {$IF (8 > 0) or (0 > 0)}
-      {$DEFINE FFMPEG_DIR := 'ffmpeg-0.8'}
+    {$IF (4 > 0) or (2 > 0)}
+      {$DEFINE FFMPEG_DIR := 'ffmpeg-2.4'}
       {$DEFINE FF_API_OLD_DECODE_AUDIO}
     {$ELSE}
       {$DEFINE FFMPEG_DIR := 'ffmpeg'}
@@ -27,31 +27,31 @@
     {$IFEND}
   {$ENDIF}
   {$IF Defined(IncludeConstants)}
-    FFMPEG_VERSION_INT = 8000;
+    FFMPEG_VERSION_INT = 2004000;
 
     av__codec = 'libavcodec';
-    LIBAVCODEC_VERSION_MAJOR   = 53;
-    LIBAVCODEC_VERSION_MINOR   = 8;
-    LIBAVCODEC_VERSION_RELEASE = 0;
+    LIBAVCODEC_VERSION_MAJOR   = 56;
+    LIBAVCODEC_VERSION_MINOR   = 1;
+    LIBAVCODEC_VERSION_RELEASE = 100;
 
     av__format = 'libavformat';
-    LIBAVFORMAT_VERSION_MAJOR   = 53;
-    LIBAVFORMAT_VERSION_MINOR   = 5;
-    LIBAVFORMAT_VERSION_RELEASE = 0;
+    LIBAVFORMAT_VERSION_MAJOR   = 56;
+    LIBAVFORMAT_VERSION_MINOR   = 4;
+    LIBAVFORMAT_VERSION_RELEASE = 101;
 
     av__util = 'libavutil';
-    LIBAVUTIL_VERSION_MAJOR   = 51;
-    LIBAVUTIL_VERSION_MINOR   = 9;
-    LIBAVUTIL_VERSION_RELEASE = 1;
+    LIBAVUTIL_VERSION_MAJOR   = 54;
+    LIBAVUTIL_VERSION_MINOR   = 7;
+    LIBAVUTIL_VERSION_RELEASE = 100;
   {$IFEND}
 {$IFEND}
 
 {$DEFINE HaveSWScale}
 {$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
   sw__scale = 'libswscale';
-  LIBSWSCALE_VERSION_MAJOR   = 2;
+  LIBSWSCALE_VERSION_MAJOR   = 3;
   LIBSWSCALE_VERSION_MINOR   = 0;
-  LIBSWSCALE_VERSION_RELEASE = 0;
+  LIBSWSCALE_VERSION_RELEASE = 100;
 {$IFEND}
 
 {$UNDEF HaveProjectM}
-- 
cgit v1.2.3