From b24b4b940f526f8fd41008618514a5dd4d1ff5f2 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Tue, 20 Jul 2010 23:14:21 +0000 Subject: update avutil to 50.18.0 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2601 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/avutil.pas | 4 ++-- src/lib/ffmpeg/mathematics.pas | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas index 5387a0f1..876d6f66 100644 --- a/src/lib/ffmpeg/avutil.pas +++ b/src/lib/ffmpeg/avutil.pas @@ -25,7 +25,7 @@ * * libavutil/avutil.h: * Min. version: 49.0.1, revision 6577, Sat Oct 7 15:30:46 2006 UTC - * Max. version: 50.16.0, revision 23255, Sun May 30 22:05:00 2010 CET + * Max. version: 50.18.0, revision 23551, Mon Jul 21 01:00:00 2010 CET * * libavutil/mem.h: * revision 16590, Tue Jan 13 23:44:16 2009 UTC @@ -92,7 +92,7 @@ const *) (* Max. supported version by this header *) LIBAVUTIL_MAX_VERSION_MAJOR = 50; - LIBAVUTIL_MAX_VERSION_MINOR = 16; + LIBAVUTIL_MAX_VERSION_MINOR = 18; LIBAVUTIL_MAX_VERSION_RELEASE = 0; LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) + (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) + diff --git a/src/lib/ffmpeg/mathematics.pas b/src/lib/ffmpeg/mathematics.pas index a2a59107..0457f066 100644 --- a/src/lib/ffmpeg/mathematics.pas +++ b/src/lib/ffmpeg/mathematics.pas @@ -22,7 +22,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/mathematics.h - * avutil max. version 50.16.0, revision 23255, Sun May 30 22:05:00 2010 CET + * avutil max. version 50.18.0, revision 23551, Mon Jul 21 01:00:00 2010 CET * *) @@ -109,6 +109,19 @@ function av_rescale_q (a: cint64; bq, cq: TAVRational): cint64; function av_compare_ts(ts_a: cint64; tb_a: TAVRational; ts_b: cint64; tb_b: TAVRational): cint; cdecl; external av__util; {$IFEND} + +{$IF LIBAVUTIL_VERSION >= 50018000} // 50.18.0 +(** + * Compare 2 integers modulo mod. + * That is we compare integers a and b for which only the least significant log2(mod) bits are known + * @param mod must be a power of 2 + * @returns a negative value if a is smaller than b + * a positiv value if a is greater than b + * 0 if a equals b + *) +function av_compare_mod(a: cuint64; b: cuint64; modVar: cuint64): cint64; + cdecl; external av__util; +{$IFEND} implementation -- cgit v1.2.3