From 96a355913e633a41b6e9192b0791ffb47aecbe20 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 18 Mar 2012 23:04:14 +0000 Subject: revert false commit git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2840 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/mathematics.pas | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/lib/ffmpeg/mathematics.pas') diff --git a/src/lib/ffmpeg/mathematics.pas b/src/lib/ffmpeg/mathematics.pas index 20ee21c2..98901c2a 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 version 50.43.0 + * avutil max. version 50.23.0, revision 24439, Wed Aug 25 05:00:00 2010 CET * *) @@ -47,13 +47,21 @@ const M_E = 2.7182818284590452354; // e M_LN2 = 0.69314718055994530942; // log_e 2 M_LN10 = 2.30258509299404568402; // log_e 10 +{$IF LIBAVUTIL_VERSION >= 50009000} // >= 50.9.0 M_LOG2_10 = 3.32192809488736234787; // log_2 10 +{$IFEND} +{$IF LIBAVUTIL_VERSION >= 50023000} // >= 50.23.0 M_PHI = 1.61803398874989484820; // phi / golden ratio +{$IFEND} M_PI = 3.14159265358979323846; // pi M_SQRT1_2 = 0.70710678118654752440; // 1/sqrt(2) +{$IF LIBAVUTIL_VERSION >= 50014000} // >= 50.14.0 M_SQRT2 = 1.41421356237309504880; // sqrt(2) +{$IFEND} +{$IF LIBAVUTIL_VERSION >= 50005001} // >= 50.5.1 NAN = 0.0/0.0; INFINITY = 1.0/0.0; +{$IFEND} type TAVRounding = ( @@ -64,6 +72,7 @@ type AV_ROUND_NEAR_INF = 5 ///< Round to nearest and halfway cases away from zero. ); +{$IF LIBAVUTIL_VERSION >= 49013000} // 49.13.0 (** * Return the greatest common divisor of a and b. * If both a or b are 0 or either or both are <0 then behavior is @@ -71,6 +80,7 @@ type *) function av_gcd(a: cint64; b: cint64): cint64; cdecl; external av__util; {av_const} +{$IFEND} (** * Rescale a 64-bit integer with rounding to nearest. @@ -92,6 +102,7 @@ function av_rescale_rnd (a, b, c: cint64; enum: TAVRounding): cint64; function av_rescale_q (a: cint64; bq, cq: TAVRational): cint64; cdecl; external av__util; {av_const} +{$IF LIBAVUTIL_VERSION >= 50008000} // 50.8.0 (** * Compare 2 timestamps each in its own timebases. * The result of the function is undefined if one of the timestamps @@ -100,7 +111,9 @@ 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 @@ -113,6 +126,7 @@ function av_compare_ts(ts_a: cint64; tb_a: TAVRational; ts_b: cint64; tb_b: TAVR *) function av_compare_mod(a: cuint64; b: cuint64; modVar: cuint64): cint64; cdecl; external av__util; +{$IFEND} implementation -- cgit v1.2.3