diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-07-30 01:34:40 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-07-30 01:34:40 +0000 |
| commit | e171c972ba120a0eaccf513170b5a19edb33dd5d (patch) | |
| tree | c61f2d2f5fbdc26dc1f38af5766ef869f5cacd44 /src | |
| parent | 5824d3decadaf7977bdf28b8d12eb4d604113243 (diff) | |
| download | usdx-e171c972ba120a0eaccf513170b5a19edb33dd5d.tar.gz usdx-e171c972ba120a0eaccf513170b5a19edb33dd5d.tar.xz usdx-e171c972ba120a0eaccf513170b5a19edb33dd5d.zip | |
fix configure for libav* >= 1.0 on Mac OS X
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3008 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
| -rw-r--r-- | src/config-darwin.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/config-darwin.inc b/src/config-darwin.inc index 5edc33af..d67e08e0 100644 --- a/src/config-darwin.inc +++ b/src/config-darwin.inc @@ -18,8 +18,8 @@ {$IF Defined(HaveFFmpeg)} {$MACRO ON} {$IFNDEF FFMPEG_DIR} - {$IF (8 > 0) or (0 > 0)} - {$DEFINE FFMPEG_DIR := 'ffmpeg-0.8'} + {$IF (0 > 0) or (1 > 0)} + {$DEFINE FFMPEG_DIR := 'ffmpeg-1.0'} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} {$DEFINE useOLD_FFMPEG} @@ -27,19 +27,19 @@ {$ENDIF} {$IF Defined(IncludeConstants)} av__codec = 'libavcodec'; - LIBAVCODEC_VERSION_MAJOR = 53; - LIBAVCODEC_VERSION_MINOR = 8; - LIBAVCODEC_VERSION_RELEASE = 0; + LIBAVCODEC_VERSION_MAJOR = 54; + LIBAVCODEC_VERSION_MINOR = 59; + LIBAVCODEC_VERSION_RELEASE = 100; av__format = 'libavformat'; - LIBAVFORMAT_VERSION_MAJOR = 53; - LIBAVFORMAT_VERSION_MINOR = 5; - LIBAVFORMAT_VERSION_RELEASE = 0; + LIBAVFORMAT_VERSION_MAJOR = 54; + LIBAVFORMAT_VERSION_MINOR = 29; + LIBAVFORMAT_VERSION_RELEASE = 104; av__util = 'libavutil'; LIBAVUTIL_VERSION_MAJOR = 51; - LIBAVUTIL_VERSION_MINOR = 9; - LIBAVUTIL_VERSION_RELEASE = 1; + LIBAVUTIL_VERSION_MINOR = 73; + LIBAVUTIL_VERSION_RELEASE = 101; {$IFEND} {$IFEND} @@ -47,8 +47,8 @@ {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} sw__scale = 'libswscale'; LIBSWSCALE_VERSION_MAJOR = 2; - LIBSWSCALE_VERSION_MINOR = 0; - LIBSWSCALE_VERSION_RELEASE = 0; + LIBSWSCALE_VERSION_MINOR = 1; + LIBSWSCALE_VERSION_RELEASE = 101; {$IFEND} {$UNDEF HaveProjectM} |