aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-12-06 18:58:19 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-12-06 18:58:19 +0000
commit9a17649166a5a6c2e1f3820675d8e4c5e83cef18 (patch)
treea7f1ecaf060d94de52c2143a3cdd799ef5bb554a
parent96ee94dee4ffb7b233ae0a809d3e548340202218 (diff)
downloadusdx-9a17649166a5a6c2e1f3820675d8e4c5e83cef18.tar.gz
usdx-9a17649166a5a6c2e1f3820675d8e4c5e83cef18.tar.xz
usdx-9a17649166a5a6c2e1f3820675d8e4c5e83cef18.zip
update to version 52.37.0. Includes fix of previous commit of 52.36.0
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1989 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/lib/ffmpeg/avformat.pas9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/ffmpeg/avformat.pas b/src/lib/ffmpeg/avformat.pas
index 44086cdd..008afd0e 100644
--- a/src/lib/ffmpeg/avformat.pas
+++ b/src/lib/ffmpeg/avformat.pas
@@ -31,7 +31,7 @@
*)
{
* update to
- * Max. version: 52.36.0, Sun Dec 6 19:33:00 2009 CET
+ * Max. version: 52.37.0, Sun Dec 6 19:57:00 2009 CET
* MiSchi
}
@@ -65,7 +65,7 @@ uses
const
(* Max. supported version by this header *)
LIBAVFORMAT_MAX_VERSION_MAJOR = 52;
- LIBAVFORMAT_MAX_VERSION_MINOR = 36;
+ LIBAVFORMAT_MAX_VERSION_MINOR = 37;
LIBAVFORMAT_MAX_VERSION_RELEASE = 0;
LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -1371,7 +1371,7 @@ function ff_new_chapter(s: PAVFormatContext; id: cint; time_base: TAVRational;
procedure av_set_pts_info(s: PAVStream; pts_wrap_bits: cint;
{$IF LIBAVFORMAT_VERSION < 52036000} // < 52.36.0
pts_num: cint; pts_den: cint);
-{$IFEND}
+{$ELSE}
pts_num: cuint; pts_den: cuint);
{$IFEND}
cdecl; external av__format;
@@ -1380,6 +1380,9 @@ const
AVSEEK_FLAG_BACKWARD = 1; ///< seek backward
AVSEEK_FLAG_BYTE = 2; ///< seeking based on position in bytes
AVSEEK_FLAG_ANY = 4; ///< seek to any frame, even non-keyframes
+{$IF LIBAVFORMAT_VERSION >= 52037000} // >= 52.37.0
+ AVSEEK_FLAG_FRAME = 8;
+{$IFEND}
function av_find_default_stream_index(s: PAVFormatContext): cint;
cdecl; external av__format;