aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbasisbit <basisbit@b956fd51-792f-4845-bead-9b4dfca2ff2c>2015-08-15 16:03:35 +0000
committerbasisbit <basisbit@b956fd51-792f-4845-bead-9b4dfca2ff2c>2015-08-15 16:03:35 +0000
commit9e7a37fb651c3b3bb0a6ffdd29b1c7735c3a622c (patch)
tree21ad16eaf6521eed7c5f2f64bfc66832c15268f2
parent463e7cbf0ba74238291d0d8d85b5d1a50d347b45 (diff)
downloadusdx-9e7a37fb651c3b3bb0a6ffdd29b1c7735c3a622c.tar.gz
usdx-9e7a37fb651c3b3bb0a6ffdd29b1c7735c3a622c.tar.xz
usdx-9e7a37fb651c3b3bb0a6ffdd29b1c7735c3a622c.zip
*raised LogFileLevel for development/debugging purposes to 50
*fixed compiling for windows *updated windows-build to most recent ffmpeg v2.7 version and fixed IPath for UVideo.TVideoPlayback_FFmpeg.Open according to v2.7 ffmpeg documentation git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3121 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/base/UMain.pas1
-rw-r--r--src/config-win.inc57
-rw-r--r--src/lib/ffmpeg-2.7/avcodec.pas2
-rw-r--r--src/lib/ffmpeg-2.7/avformat.pas4
-rw-r--r--src/lib/ffmpeg-2.7/avutil.pas2
-rw-r--r--src/media/UVideo.pas4
6 files changed, 41 insertions, 29 deletions
diff --git a/src/base/UMain.pas b/src/base/UMain.pas
index 14a543d1..39f52c4d 100644
--- a/src/base/UMain.pas
+++ b/src/base/UMain.pas
@@ -149,6 +149,7 @@ begin
Log.BenchmarkStart(1);
Log.LogStatus('Initialize Paths', 'Initialization');
InitializePaths;
+ Log.SetLogFileLevel(50);
Log.LogStatus('Load Language', 'Initialization');
Language := TLanguage.Create;
diff --git a/src/config-win.inc b/src/config-win.inc
index 826e3864..e8932b7a 100644
--- a/src/config-win.inc
+++ b/src/config-win.inc
@@ -6,40 +6,51 @@
{$IF Defined(IncludeConstants)}
LUA_LIB_NAME = 'lua';
- LUA_VERSION_INT = 5001004;
- LUA_VERSION_RELEASE = '4';
+ LUA_VERSION_INT = 5001005;
+ LUA_VERSION_RELEASE = '5';
LUA_VERSION_MINOR = '1';
LUA_VERSION_MAJOR = '5';
- LUA_VERSION = '5.1.4';
+ LUA_VERSION = '5.1.5';
{$IFEND}
{$DEFINE HaveFFmpeg}
+//the required DLLs can be downloaded here: https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-20150814-git-affbecb-win32-shared.7z
+{$IF Defined(HaveFFmpeg)}
+ {$MACRO ON}
+ {$IFNDEF FFMPEG_DIR}
+ {$IF (4 > 0) or (2 > 0)}
+ {$DEFINE FFMPEG_DIR := 'ffmpeg-2.7'}
+ {$DEFINE FF_API_OLD_DECODE_AUDIO}
+ {$ELSE}
+ {$DEFINE FFMPEG_DIR := 'ffmpeg'}
+ {$DEFINE useOLD_FFMPEG}
+ {$IFEND}
+ {$ENDIF}
+ {$IF Defined(IncludeConstants)}
+ FFMPEG_VERSION_INT = 2007000;
+ av__codec = 'avcodec-56';
+ LIBAVCODEC_VERSION_MAJOR = 56;
+ LIBAVCODEC_VERSION_MINOR = 57;
+ LIBAVCODEC_VERSION_RELEASE = 100;
-{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)}
- FFMPEG_DIR = 'ffmpeg';
-
- av__codec = 'avcodec-52';
- LIBAVCODEC_VERSION_MAJOR = 52;
- LIBAVCODEC_VERSION_MINOR = 67;
- LIBAVCODEC_VERSION_RELEASE = 2;
+ av__format = 'avformat-56';
+ LIBAVFORMAT_VERSION_MAJOR = 56;
+ LIBAVFORMAT_VERSION_MINOR = 40;
+ LIBAVFORMAT_VERSION_RELEASE = 101;
- av__format = 'avformat-52';
- LIBAVFORMAT_VERSION_MAJOR = 52;
- LIBAVFORMAT_VERSION_MINOR = 62;
- LIBAVFORMAT_VERSION_RELEASE = 0;
-
- av__util = 'avutil-50';
- LIBAVUTIL_VERSION_MAJOR = 50;
- LIBAVUTIL_VERSION_MINOR = 15;
- LIBAVUTIL_VERSION_RELEASE = 2;
+ av__util = 'avutil-54';
+ LIBAVUTIL_VERSION_MAJOR = 54;
+ LIBAVUTIL_VERSION_MINOR = 30;
+ LIBAVUTIL_VERSION_RELEASE = 100;
+ {$IFEND}
{$IFEND}
{$DEFINE HaveSWScale}
{$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
- sw__scale = 'swscale-0';
- LIBSWSCALE_VERSION_MAJOR = 0;
- LIBSWSCALE_VERSION_MINOR = 10;
- LIBSWSCALE_VERSION_RELEASE = 0;
+ sw__scale = 'swscale-3';
+ LIBSWSCALE_VERSION_MAJOR = 3;
+ LIBSWSCALE_VERSION_MINOR = 1;
+ LIBSWSCALE_VERSION_RELEASE = 101;
{$IFEND}
{$DEFINE HaveProjectM}
diff --git a/src/lib/ffmpeg-2.7/avcodec.pas b/src/lib/ffmpeg-2.7/avcodec.pas
index 4477555f..bdedb4de 100644
--- a/src/lib/ffmpeg-2.7/avcodec.pas
+++ b/src/lib/ffmpeg-2.7/avcodec.pas
@@ -84,7 +84,7 @@ const
(* Supported version by this header *)
LIBAVCODEC_MAX_VERSION_MAJOR = 56;
- LIBAVCODEC_MAX_VERSION_MINOR = 41;
+ LIBAVCODEC_MAX_VERSION_MINOR = 57;
LIBAVCODEC_MAX_VERSION_RELEASE = 100;
LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
diff --git a/src/lib/ffmpeg-2.7/avformat.pas b/src/lib/ffmpeg-2.7/avformat.pas
index cf5a5265..60046791 100644
--- a/src/lib/ffmpeg-2.7/avformat.pas
+++ b/src/lib/ffmpeg-2.7/avformat.pas
@@ -63,8 +63,8 @@ const
*)
(* Max. supported version by this header *)
LIBAVFORMAT_MAX_VERSION_MAJOR = 56;
- LIBAVFORMAT_MAX_VERSION_MINOR = 36;
- LIBAVFORMAT_MAX_VERSION_RELEASE = 100;
+ LIBAVFORMAT_MAX_VERSION_MINOR = 40;
+ LIBAVFORMAT_MAX_VERSION_RELEASE = 101;
LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
(LIBAVFORMAT_MAX_VERSION_RELEASE * VERSION_RELEASE);
diff --git a/src/lib/ffmpeg-2.7/avutil.pas b/src/lib/ffmpeg-2.7/avutil.pas
index a4d7ad63..94b5220e 100644
--- a/src/lib/ffmpeg-2.7/avutil.pas
+++ b/src/lib/ffmpeg-2.7/avutil.pas
@@ -58,7 +58,7 @@ uses
const
(* Max. supported version by this header *)
LIBAVUTIL_MAX_VERSION_MAJOR = 54;
- LIBAVUTIL_MAX_VERSION_MINOR = 27;
+ LIBAVUTIL_MAX_VERSION_MINOR = 30;
LIBAVUTIL_MAX_VERSION_RELEASE = 100;
LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
diff --git a/src/media/UVideo.pas b/src/media/UVideo.pas
index 711234fa..e6019827 100644
--- a/src/media/UVideo.pas
+++ b/src/media/UVideo.pas
@@ -336,11 +336,11 @@ begin
{$ELSEIF LIBAVFORMAT_VERSION < 54029104}
errnum := avformat_open_input(@fFormatContext, PAnsiChar('ufile:'+FileName.ToUTF8), nil, nil);
{$ELSE}
- errnum := FFmpegCore.AVFormatOpenInput(@fFormatContext, PAnsiChar('ufile:'+FileName.ToUTF8));
+ errnum := FFmpegCore.AVFormatOpenInput(@fFormatContext, PAnsiChar(FileName.ToUTF8));//'ufile:'+FileName.ToUTF8));
{$IFEND}
if (errnum <> 0) then
begin
- Log.LogError('Failed to open file "'+ FileName.ToNative +'" ('+FFmpegCore.GetErrorString(errnum)+')');
+ Log.LogError('Failed to open file "'+ FileName.ToNative +'" ('+FFmpegCore.GetErrorString(errnum)+'::'+IntToStr(errnum)+')');
Exit;
end;