From 4dea02ed19873fbd8ee454a1b1147ad10436ab91 Mon Sep 17 00:00:00 2001
From: brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 14 Feb 2016 18:13:57 +0000
Subject: Only try to include libswresample if it is installed and we have
 pascal headers for that specific version

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3194 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/ultrastardx.dpr | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/ultrastardx.dpr')

diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr
index d5f675a5..89777968 100644
--- a/src/ultrastardx.dpr
+++ b/src/ultrastardx.dpr
@@ -99,7 +99,9 @@ uses
       {$ENDIF}
       {$IFDEF UseSWScale}
         swscale           in 'lib\' + FFMPEG_DIR + '\swscale.pas',
-				swresample        in 'lib\' + FFMPEG_DIR + '\swresample.pas',
+      {$ENDIF}
+      {$IFDEF UseSWResample}
+        swresample          in 'lib\' + FFMPEG_DIR + '\swresample.pas',
       {$ENDIF}
     {$ELSE} // speak: This is for Delphi. Change version as needed!
       avcodec            in 'lib\ffmpeg-0.10\avcodec.pas',
@@ -109,7 +111,9 @@ uses
       avio               in 'lib\ffmpeg-0.10\avio.pas',
       {$IFDEF UseSWScale}
         swscale          in 'lib\ffmpeg-0.10\swscale.pas',
-				swresample       in 'lib\ffmpeg-0.10\swresample.pas',
+      {$ENDIF}
+      {$IFDEF UseSWResample}
+        swresample          in 'lib\ffmpeg-0.10\swresample.pas',
       {$ENDIF}
     {$ENDIF}
     UMediaCore_FFmpeg    in 'media\UMediaCore_FFmpeg.pas',
-- 
cgit v1.2.3