4 files changed, 7 insertions, 8 deletions
diff --git a/mediaplugin/src/media/UAudioDecoder_FFmpeg.pas b/mediaplugin/src/media/UAudioDecoderPlugin.pas
index 96d1e9e9..8298cf17 100644
--- a/mediaplugin/src/media/UAudioDecoder_FFmpeg.pas
+++ b/mediaplugin/src/media/UAudioDecoderPlugin.pas
@@ -23,7 +23,7 @@
  * $Id$
  *}
 
-unit UAudioDecoder_FFmpeg;
+unit UAudioDecoderPlugin;
 
 (*******************************************************************************
  *
diff --git a/mediaplugin/src/media/UMediaPlugin.pas b/mediaplugin/src/media/UMediaPlugin.pas
index 0fa72852..9f3c8160 100644
--- a/mediaplugin/src/media/UMediaPlugin.pas
+++ b/mediaplugin/src/media/UMediaPlugin.pas
@@ -157,8 +157,8 @@ uses
   UPath,
   UPathUtils,
   ULog,
-  UAudioDecoder_FFmpeg,
-  UVideoDecoder_FFmpeg;
+  UAudioDecoderPlugin,
+  UVideoDecoderPlugin;
 
 var
   MediaPluginCore_Instance: TMediaPluginCore;
diff --git a/mediaplugin/src/media/UVideoDecoder_FFmpeg.pas b/mediaplugin/src/media/UVideoDecoderPlugin.pas
index 073bef9c..684b6031 100644
--- a/mediaplugin/src/media/UVideoDecoder_FFmpeg.pas
+++ b/mediaplugin/src/media/UVideoDecoderPlugin.pas
@@ -23,7 +23,7 @@
  * $Id$
  *}
 
-unit UVideoDecoder_FFmpeg;
+unit UVideoDecoderPlugin;
 
 interface
 
diff --git a/mediaplugin/src/ultrastardx.dpr b/mediaplugin/src/ultrastardx.dpr
index aafb88b0..26ff65d5 100644
--- a/mediaplugin/src/ultrastardx.dpr
+++ b/mediaplugin/src/ultrastardx.dpr
@@ -254,11 +254,10 @@ uses
   //******************************
 
   UMediaPlugin              in 'media\UMediaPlugin.pas',
-  UVideo                    in 'media\UVideo.pas',
+  UVideoDecoderPlugin       in 'media\UVideoDecoderPlugin.pas',
+  UAudioDecoderPlugin       in 'media\UAudioDecoderPlugin.pas',
 
-  // TODO: load dynamically
-  UVideoDecoder_FFmpeg      in 'media\UVideoDecoder_FFmpeg.pas',
-  UAudioDecoder_FFmpeg      in 'media\UAudioDecoder_FFmpeg.pas',
+  UVideo                    in 'media\UVideo.pas',
 
 {$IFDEF UseProjectM}
   // must be after UVideo, so it will not be the default video module