From f7bce206db9ea00906dc5ba5d0a20d6fbce0ef82 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 27 Aug 2008 10:38:20 +0000
Subject: - spelling corrected FFMpeg -> FFmpeg - the WIN32 define is not used
 anymore with MacOSX -> comment in switches.inc removed

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1298 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/UltraStar.dpr | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Game/Code/UltraStar.dpr')

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index 4b3f4e82..c39f596c 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -65,7 +65,7 @@ uses
   portmixer              in 'lib\portmixer\delphi\portmixer.pas',
   {$ENDIF}
 
-  {$IFDEF UseFFMpeg}
+  {$IFDEF UseFFmpeg}
   avcodec                in 'lib\ffmpeg\avcodec.pas',
   avformat               in 'lib\ffmpeg\avformat.pas',
   avutil                 in 'lib\ffmpeg\avutil.pas',
@@ -73,7 +73,7 @@ uses
   opt                    in 'lib\ffmpeg\opt.pas',
   avio                   in 'lib\ffmpeg\avio.pas',
   mathematics            in 'lib\ffmpeg\mathematics.pas',
-  UMediaCore_FFMpeg      in 'Classes\UMediaCore_FFMpeg.pas',
+  UMediaCore_FFmpeg      in 'Classes\UMediaCore_FFmpeg.pas',
   {$IFDEF UseSWScale}
   swscale                in 'lib\ffmpeg\swscale.pas',
   {$ENDIF}
@@ -205,7 +205,7 @@ uses
 
   // TODO :  these all should be moved to a media folder
 
-{$IFDEF UseFFMpegVideo}
+{$IFDEF UseFFmpegVideo}
   UVideo                    in 'Classes\UVideo.pas',
 {$ENDIF}
 {$IFDEF UseProjectM}
@@ -216,7 +216,7 @@ uses
   UAudioInput_Bass          in 'Classes\UAudioInput_Bass.pas',
 {$ENDIF}
 {$IFDEF UseBASSDecoder}
-  // prefer Bass to FFMpeg if possible 
+  // prefer Bass to FFmpeg if possible
   UAudioDecoder_Bass        in 'Classes\UAudioDecoder_Bass.pas',
 {$ENDIF}
 {$IFDEF UseBASSPlayback}
@@ -231,8 +231,8 @@ uses
 {$IFDEF UsePortaudioPlayback}
   UAudioPlayback_Portaudio  in 'Classes\UAudioPlayback_Portaudio.pas',
 {$ENDIF}
-{$IFDEF UseFFMpegDecoder}
-  UAudioDecoder_FFMpeg      in 'Classes\UAudioDecoder_FFMpeg.pas',
+{$IFDEF UseFFmpegDecoder}
+  UAudioDecoder_FFmpeg      in 'Classes\UAudioDecoder_FFmpeg.pas',
 {$ENDIF}
   // fallback dummy, must be last
   UMedia_dummy              in 'Classes\UMedia_dummy.pas',
-- 
cgit v1.2.3