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.inc.in | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/config.inc.in')

diff --git a/src/config.inc.in b/src/config.inc.in
index d57c7ab4..9fdac067 100644
--- a/src/config.inc.in
+++ b/src/config.inc.in
@@ -10,7 +10,16 @@
 {$IFEND}
 
 {$@DEFINE_HAVE_FFMPEG@ HaveFFmpeg}
-{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)}
+{$IF Defined(HaveFFmpeg)}
+  {$MACRO ON}
+  {$IFNDEF FFMPEG_DIR}
+    {$IF @FFMPEG_VERSION_MINOR@ > 0}
+      {$DEFINE FFMPEG_DIR := 'ffmpeg-@FFMPEG_VERSION_MAJOR@.@FFMPEG_VERSION_MINOR@'}
+    {$ELSE}
+      {$DEFINE FFMPEG_DIR := 'ffmpeg'}
+    {$IFEND}
+  {$IFEND}
+  {$IF Defined(IncludeConstants)}
   av__codec = 'libavcodec';
   LIBAVCODEC_VERSION_MAJOR   = @libavcodec_VERSION_MAJOR@;
   LIBAVCODEC_VERSION_MINOR   = @libavcodec_VERSION_MINOR@;
@@ -25,6 +34,8 @@
   LIBAVUTIL_VERSION_MAJOR   = @libavutil_VERSION_MAJOR@;
   LIBAVUTIL_VERSION_MINOR   = @libavutil_VERSION_MINOR@;
   LIBAVUTIL_VERSION_RELEASE = @libavutil_VERSION_RELEASE@;
+  
+  {$IFEND}
 {$IFEND}
 
 {$@DEFINE_HAVE_SWSCALE@ HaveSWScale}
-- 
cgit v1.2.3