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/config-darwin.inc | |
| 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 'src/config-darwin.inc')
| -rw-r--r-- | src/config-darwin.inc | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/config-darwin.inc b/src/config-darwin.inc index 5eb38d76..395a375f 100644 --- a/src/config-darwin.inc +++ b/src/config-darwin.inc @@ -10,28 +10,39 @@ {$IFEND} {$DEFINE HaveFFmpeg} -{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} +{$IF Defined(HaveFFmpeg)} + {$MACRO ON} + {$IFNDEF FFMPEG_DIR} + {$IF 7 > 0} + {$DEFINE FFMPEG_DIR := 'ffmpeg-0.7'} + {$ELSE} + {$DEFINE FFMPEG_DIR := 'ffmpeg'} + {$IFEND} + {$IFEND} + {$IF Defined(IncludeConstants)} av__codec = 'libavcodec'; - LIBAVCODEC_VERSION_MAJOR = 51; - LIBAVCODEC_VERSION_MINOR = 49; + LIBAVCODEC_VERSION_MAJOR = 52; + LIBAVCODEC_VERSION_MINOR = 123; LIBAVCODEC_VERSION_RELEASE = 0; av__format = 'libavformat'; LIBAVFORMAT_VERSION_MAJOR = 52; - LIBAVFORMAT_VERSION_MINOR = 2; + LIBAVFORMAT_VERSION_MINOR = 111; LIBAVFORMAT_VERSION_RELEASE = 0; av__util = 'libavutil'; - LIBAVUTIL_VERSION_MAJOR = 49; - LIBAVUTIL_VERSION_MINOR = 6; + LIBAVUTIL_VERSION_MAJOR = 50; + LIBAVUTIL_VERSION_MINOR = 43; LIBAVUTIL_VERSION_RELEASE = 0; + + {$IFEND} {$IFEND} {$DEFINE HaveSWScale} {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} sw__scale = 'libswscale'; - LIBSWSCALE_VERSION_MAJOR = 0; - LIBSWSCALE_VERSION_MINOR = 5; + LIBSWSCALE_VERSION_MAJOR = 2; + LIBSWSCALE_VERSION_MINOR = 0; LIBSWSCALE_VERSION_RELEASE = 0; {$IFEND} @@ -52,7 +63,7 @@ {$DEFINE HaveLibPcre} {$IF Defined(HaveLibPcre) and Defined(IncludeConstants)} - LIBPCRE_LIBDIR = '/sw/lib'; + LIBPCRE_LIBDIR = '/sw/lib/libpcre1'; {$IFEND} {$UNDEF HavePortmixer} |