aboutsummaryrefslogtreecommitdiffstats
path: root/mediaplugin/src/ultrastardx.dpr
diff options
context:
space:
mode:
Diffstat (limited to 'mediaplugin/src/ultrastardx.dpr')
-rw-r--r--mediaplugin/src/ultrastardx.dpr24
1 files changed, 4 insertions, 20 deletions
diff --git a/mediaplugin/src/ultrastardx.dpr b/mediaplugin/src/ultrastardx.dpr
index bce94001..aafb88b0 100644
--- a/mediaplugin/src/ultrastardx.dpr
+++ b/mediaplugin/src/ultrastardx.dpr
@@ -88,20 +88,6 @@ uses
portmixer in 'lib\portmixer\portmixer.pas',
{$ENDIF}
- {$IFDEF UseFFmpeg}
- avcodec in 'lib\ffmpeg\avcodec.pas',
- avformat in 'lib\ffmpeg\avformat.pas',
- avutil in 'lib\ffmpeg\avutil.pas',
- rational in 'lib\ffmpeg\rational.pas',
- opt in 'lib\ffmpeg\opt.pas',
- avio in 'lib\ffmpeg\avio.pas',
- mathematics in 'lib\ffmpeg\mathematics.pas',
- UMediaCore_FFmpeg in 'media\UMediaCore_FFmpeg.pas',
- {$IFDEF UseSWScale}
- swscale in 'lib\ffmpeg\swscale.pas',
- {$ENDIF}
- {$ENDIF}
-
{$IFDEF UseSRCResample}
samplerate in 'lib\samplerate\samplerate.pas',
{$ENDIF}
@@ -268,11 +254,12 @@ uses
//******************************
UMediaPlugin in 'media\UMediaPlugin.pas',
-
-{$IFDEF UseFFmpegVideo}
UVideo in 'media\UVideo.pas',
+
+ // TODO: load dynamically
UVideoDecoder_FFmpeg in 'media\UVideoDecoder_FFmpeg.pas',
-{$ENDIF}
+ UAudioDecoder_FFmpeg in 'media\UAudioDecoder_FFmpeg.pas',
+
{$IFDEF UseProjectM}
// must be after UVideo, so it will not be the default video module
UVisualizer in 'media\UVisualizer.pas',
@@ -296,9 +283,6 @@ uses
{$IFDEF UsePortaudioPlayback}
UAudioPlayback_Portaudio in 'media\UAudioPlayback_Portaudio.pas',
{$ENDIF}
-{$IFDEF UseFFmpegDecoder}
- UAudioDecoder_FFmpeg in 'media\UAudioDecoder_FFmpeg.pas',
-{$ENDIF}
// fallback dummy, must be last
UMedia_dummy in 'media\UMedia_dummy.pas',