diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-10-28 14:38:26 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-10-28 14:38:26 +0000 |
| commit | f8f21b447558c911bcd4bbaaf45e9d7ba52e8fe1 (patch) | |
| tree | bd3b688d3411eff8224ce4db65f17b1159ba288b /mediaplugin/src/switches.inc | |
| parent | 40acf26d6752ec031d814dd88136afb6fca966d1 (diff) | |
| download | usdx-f8f21b447558c911bcd4bbaaf45e9d7ba52e8fe1.tar.gz usdx-f8f21b447558c911bcd4bbaaf45e9d7ba52e8fe1.tar.xz usdx-f8f21b447558c911bcd4bbaaf45e9d7ba52e8fe1.zip | |
removed ffmpeg stuff
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2694 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | mediaplugin/src/switches.inc | 15 |
1 files changed, 2 insertions, 13 deletions
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} |