diff options
author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-20 19:54:15 +0000 |
---|---|---|
committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-20 19:54:15 +0000 |
commit | 170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8 (patch) | |
tree | a3777f7cc3680b76d298a520a407170ef8143285 /src/ultrastardx.dpr | |
parent | 9bc840d97697bc6445aab17368bad58d02018a2a (diff) | |
download | usdx-170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8.tar.gz usdx-170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8.tar.xz usdx-170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8.zip |
new detection of ffmpeg version. API changes: SampleFormat -> AVSampleFormat. Configure still needs update. Special thanks to lotan.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2856 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | src/ultrastardx.dpr | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index f6c9558c..21e89e2d 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -85,19 +85,16 @@ uses {$IFDEF UsePortmixer} 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', + avcodec in 'lib\' + FFMPEG_DIR + '\avcodec.pas', + avformat in 'lib\' + FFMPEG_DIR + '\avformat.pas', + avutil in 'lib\' + FFMPEG_DIR + '\avutil.pas', + rational in 'lib\' + FFMPEG_DIR + '\rational.pas', + avio in 'lib\' + FFMPEG_DIR + '\avio.pas', + {$IFDEF UseSWScale} + swscale in 'lib\' + FFMPEG_DIR + '\swscale.pas', + {$ENDIF} UMediaCore_FFmpeg in 'media\UMediaCore_FFmpeg.pas', - {$IFDEF UseSWScale} - swscale in 'lib\ffmpeg\swscale.pas', - {$ENDIF} {$ENDIF} {$IFDEF UseSRCResample} @@ -242,7 +239,7 @@ uses {$IF Defined(MSWINDOWS)} UPlatformWindows in 'base\UPlatformWindows.pas', {$ELSEIF Defined(DARWIN)} - UPlatformMacOSX in 'base/UPlatformMacOSX.pas', + UPlatformMacOSX in 'base\UPlatformMacOSX.pas', {$ELSEIF Defined(UNIX)} UPlatformLinux in 'base\UPlatformLinux.pas', {$IFEND} |