From 170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 20 Apr 2012 19:54:15 +0000
Subject: new detection of ffmpeg version. API changes: SampleFormat ->
 AVSampleFormat. Configure still needs update. Special thanks to lotan.

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

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

diff --git a/src/config-darwin.inc b/src/config-darwin.inc
index 5eb38d76..395a375f 100644
--- a/src/config-darwin.inc
+++ b/src/config-darwin.inc
@@ -10,28 +10,39 @@
 {$IFEND}
 
 {$DEFINE HaveFFmpeg}
-{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)}
+{$IF Defined(HaveFFmpeg)}
+  {$MACRO ON}
+  {$IFNDEF FFMPEG_DIR}
+    {$IF 7 > 0}
+      {$DEFINE FFMPEG_DIR := 'ffmpeg-0.7'}
+    {$ELSE}
+      {$DEFINE FFMPEG_DIR := 'ffmpeg'}
+    {$IFEND}
+  {$IFEND}
+  {$IF Defined(IncludeConstants)}
   av__codec = 'libavcodec';
-  LIBAVCODEC_VERSION_MAJOR   = 51;
-  LIBAVCODEC_VERSION_MINOR   = 49;
+  LIBAVCODEC_VERSION_MAJOR   = 52;
+  LIBAVCODEC_VERSION_MINOR   = 123;
   LIBAVCODEC_VERSION_RELEASE = 0;
 
   av__format = 'libavformat';
   LIBAVFORMAT_VERSION_MAJOR   = 52;
-  LIBAVFORMAT_VERSION_MINOR   = 2;
+  LIBAVFORMAT_VERSION_MINOR   = 111;
   LIBAVFORMAT_VERSION_RELEASE = 0;
 
   av__util = 'libavutil';
-  LIBAVUTIL_VERSION_MAJOR   = 49;
-  LIBAVUTIL_VERSION_MINOR   = 6;
+  LIBAVUTIL_VERSION_MAJOR   = 50;
+  LIBAVUTIL_VERSION_MINOR   = 43;
   LIBAVUTIL_VERSION_RELEASE = 0;
+  
+  {$IFEND}
 {$IFEND}
 
 {$DEFINE HaveSWScale}
 {$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
   sw__scale = 'libswscale';
-  LIBSWSCALE_VERSION_MAJOR   = 0;
-  LIBSWSCALE_VERSION_MINOR   = 5;
+  LIBSWSCALE_VERSION_MAJOR   = 2;
+  LIBSWSCALE_VERSION_MINOR   = 0;
   LIBSWSCALE_VERSION_RELEASE = 0;
 {$IFEND}
 
@@ -52,7 +63,7 @@
 
 {$DEFINE HaveLibPcre}
 {$IF Defined(HaveLibPcre) and Defined(IncludeConstants)}
-  LIBPCRE_LIBDIR   = '/sw/lib';
+  LIBPCRE_LIBDIR   = '/sw/lib/libpcre1';
 {$IFEND}
 
 {$UNDEF HavePortmixer}
-- 
cgit v1.2.3