diff options
| -rw-r--r-- | src/config-darwin.inc | 30 | ||||
| -rw-r--r-- | src/lib/ffmpeg-1.2/libavutil/opt.pas | 6 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/config-darwin.inc b/src/config-darwin.inc index d67e08e0..eff33d4f 100644 --- a/src/config-darwin.inc +++ b/src/config-darwin.inc @@ -7,19 +7,19 @@ {$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} {$IF Defined(HaveFFmpeg)} {$MACRO ON} {$IFNDEF FFMPEG_DIR} - {$IF (0 > 0) or (1 > 0)} - {$DEFINE FFMPEG_DIR := 'ffmpeg-1.0'} + {$IF (8 > 0) or (0 > 0)} + {$DEFINE FFMPEG_DIR := 'ffmpeg-0.8'} {$ELSE} {$DEFINE FFMPEG_DIR := 'ffmpeg'} {$DEFINE useOLD_FFMPEG} @@ -27,19 +27,19 @@ {$ENDIF} {$IF Defined(IncludeConstants)} av__codec = 'libavcodec'; - LIBAVCODEC_VERSION_MAJOR = 54; - LIBAVCODEC_VERSION_MINOR = 59; - LIBAVCODEC_VERSION_RELEASE = 100; + LIBAVCODEC_VERSION_MAJOR = 53; + LIBAVCODEC_VERSION_MINOR = 8; + LIBAVCODEC_VERSION_RELEASE = 0; av__format = 'libavformat'; - LIBAVFORMAT_VERSION_MAJOR = 54; - LIBAVFORMAT_VERSION_MINOR = 29; - LIBAVFORMAT_VERSION_RELEASE = 104; + LIBAVFORMAT_VERSION_MAJOR = 53; + LIBAVFORMAT_VERSION_MINOR = 5; + LIBAVFORMAT_VERSION_RELEASE = 0; av__util = 'libavutil'; LIBAVUTIL_VERSION_MAJOR = 51; - LIBAVUTIL_VERSION_MINOR = 73; - LIBAVUTIL_VERSION_RELEASE = 101; + LIBAVUTIL_VERSION_MINOR = 9; + LIBAVUTIL_VERSION_RELEASE = 1; {$IFEND} {$IFEND} @@ -47,8 +47,8 @@ {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} sw__scale = 'libswscale'; LIBSWSCALE_VERSION_MAJOR = 2; - LIBSWSCALE_VERSION_MINOR = 1; - LIBSWSCALE_VERSION_RELEASE = 101; + LIBSWSCALE_VERSION_MINOR = 0; + LIBSWSCALE_VERSION_RELEASE = 0; {$IFEND} {$UNDEF HaveProjectM} diff --git a/src/lib/ffmpeg-1.2/libavutil/opt.pas b/src/lib/ffmpeg-1.2/libavutil/opt.pas index 701d719a..693e9da5 100644 --- a/src/lib/ffmpeg-1.2/libavutil/opt.pas +++ b/src/lib/ffmpeg-1.2/libavutil/opt.pas @@ -331,9 +331,9 @@ function av_opt_set_dict(obj: pointer; var options: PAVDictionary): cint; * AVERROR(EINVAL) if no key is present * *) -av_opt_get_key_value(ropts: {const} PPAnsiChar; - key_val_sep: {const} PAnsiChar; pairs_sep: {const} PAnsiChar - flags: byte, +function av_opt_get_key_value(ropts: {const} PPAnsiChar; + key_val_sep: {const} PAnsiChar; pairs_sep: {const} PAnsiChar; + flags: byte; rkey, rval: PPAnsiChar): cint; cdecl; external av__util; |