diff options
author | basisbit <basisbit@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2015-10-11 23:47:26 +0000 |
---|---|---|
committer | basisbit <basisbit@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2015-10-11 23:47:26 +0000 |
commit | 42c3f6d5404e3cfa42db1b942561a280fabca418 (patch) | |
tree | 5f7f10f84ea8e8ce6b417701f69d254ea5ea524c /src/config-win.inc | |
parent | 086642246da49e0ad2de8857004e083081a14867 (diff) | |
download | usdx-42c3f6d5404e3cfa42db1b942561a280fabca418.tar.gz usdx-42c3f6d5404e3cfa42db1b942561a280fabca418.tar.xz usdx-42c3f6d5404e3cfa42db1b942561a280fabca418.zip |
* fix running with SDL-image 1.2.15 for windows
* update windows-build to ffmpeg 2.8.0
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3142 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/config-win.inc')
-rw-r--r-- | src/config-win.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/config-win.inc b/src/config-win.inc index e8932b7a..6d32043b 100644 --- a/src/config-win.inc +++ b/src/config-win.inc @@ -19,7 +19,7 @@ {$MACRO ON} {$IFNDEF FFMPEG_DIR} {$IF (4 > 0) or (2 > 0)} - {$DEFINE FFMPEG_DIR := 'ffmpeg-2.7'} + {$DEFINE FFMPEG_DIR := 'ffmpeg-2.8'} {$DEFINE FF_API_OLD_DECODE_AUDIO} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} @@ -27,10 +27,10 @@ {$IFEND} {$ENDIF} {$IF Defined(IncludeConstants)} - FFMPEG_VERSION_INT = 2007000; + FFMPEG_VERSION_INT = 2008000; av__codec = 'avcodec-56'; LIBAVCODEC_VERSION_MAJOR = 56; - LIBAVCODEC_VERSION_MINOR = 57; + LIBAVCODEC_VERSION_MINOR = 60; LIBAVCODEC_VERSION_RELEASE = 100; av__format = 'avformat-56'; @@ -40,7 +40,7 @@ av__util = 'avutil-54'; LIBAVUTIL_VERSION_MAJOR = 54; - LIBAVUTIL_VERSION_MINOR = 30; + LIBAVUTIL_VERSION_MINOR = 31; LIBAVUTIL_VERSION_RELEASE = 100; {$IFEND} {$IFEND} |