From f8f21b447558c911bcd4bbaaf45e9d7ba52e8fe1 Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 28 Oct 2010 14:38:26 +0000 Subject: removed ffmpeg stuff git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2694 b956fd51-792f-4845-bead-9b4dfca2ff2c --- mediaplugin/src/switches.inc | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'mediaplugin/src/switches.inc') diff --git a/mediaplugin/src/switches.inc b/mediaplugin/src/switches.inc index 64ebb5c2..66ed2320 100644 --- a/mediaplugin/src/switches.inc +++ b/mediaplugin/src/switches.inc @@ -93,15 +93,8 @@ {$ENDIF} {$IFEND} -// ffmpeg config -{$IFDEF HaveFFmpeg} - {$DEFINE UseFFmpegDecoder} - {$DEFINE UseFFmpegResample} - {$DEFINE UseFFmpegVideo} - {$IFDEF HaveSWScale} - {$DEFINE UseSWScale} - {$ENDIF} -{$ENDIF} +// ffmpeg config (TODO: remove when dynamically loaded) +{$DEFINE UseFFmpegResample} {$IFDEF HaveLibsamplerate} {$DEFINE UseSRCResample} @@ -114,10 +107,6 @@ // specify some useful defines -{$IF Defined(UseFFmpegVideo) or Defined(UseFFmpegDecoder)} - {$DEFINE UseFFmpeg} -{$IFEND} - {$IF Defined(UseBASSInput) or Defined(UseBASSPlayback) or Defined(UseBASSDecoder)} {$DEFINE UseBASS} {$IFEND} -- cgit v1.2.3