diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-11-22 11:49:39 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-11-22 11:49:39 +0000 |
| commit | 3a42880592166db97707282162b84c97a30cf51f (patch) | |
| tree | f58b0935fab23e49290d1e033d7c484c98e721e4 /src/config-darwin.inc | |
| parent | e1b891639d0efe89805587aaaf78c953867fd638 (diff) | |
| download | usdx-3a42880592166db97707282162b84c97a30cf51f.tar.gz usdx-3a42880592166db97707282162b84c97a30cf51f.tar.xz usdx-3a42880592166db97707282162b84c97a30cf51f.zip | |
adding ffmpeg-2.4. compiles, but crashes on Mac OS X.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3083 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/config-darwin.inc')
| -rw-r--r-- | src/config-darwin.inc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/config-darwin.inc b/src/config-darwin.inc index edfceb47..8bde009d 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 (4 > 0) or (2 > 0)} + {$DEFINE FFMPEG_DIR := 'ffmpeg-2.4'} {$DEFINE FF_API_OLD_DECODE_AUDIO} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} @@ -27,31 +27,31 @@ {$IFEND} {$ENDIF} {$IF Defined(IncludeConstants)} - FFMPEG_VERSION_INT = 8000; + FFMPEG_VERSION_INT = 2004000; av__codec = 'libavcodec'; - LIBAVCODEC_VERSION_MAJOR = 53; - LIBAVCODEC_VERSION_MINOR = 8; - LIBAVCODEC_VERSION_RELEASE = 0; + LIBAVCODEC_VERSION_MAJOR = 56; + LIBAVCODEC_VERSION_MINOR = 1; + LIBAVCODEC_VERSION_RELEASE = 100; av__format = 'libavformat'; - LIBAVFORMAT_VERSION_MAJOR = 53; - LIBAVFORMAT_VERSION_MINOR = 5; - LIBAVFORMAT_VERSION_RELEASE = 0; + LIBAVFORMAT_VERSION_MAJOR = 56; + LIBAVFORMAT_VERSION_MINOR = 4; + LIBAVFORMAT_VERSION_RELEASE = 101; av__util = 'libavutil'; - LIBAVUTIL_VERSION_MAJOR = 51; - LIBAVUTIL_VERSION_MINOR = 9; - LIBAVUTIL_VERSION_RELEASE = 1; + LIBAVUTIL_VERSION_MAJOR = 54; + LIBAVUTIL_VERSION_MINOR = 7; + LIBAVUTIL_VERSION_RELEASE = 100; {$IFEND} {$IFEND} {$DEFINE HaveSWScale} {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} sw__scale = 'libswscale'; - LIBSWSCALE_VERSION_MAJOR = 2; + LIBSWSCALE_VERSION_MAJOR = 3; LIBSWSCALE_VERSION_MINOR = 0; - LIBSWSCALE_VERSION_RELEASE = 0; + LIBSWSCALE_VERSION_RELEASE = 100; {$IFEND} {$UNDEF HaveProjectM} |