aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg/avutil.pas32
-rw-r--r--src/lib/ffmpeg/error.pas6
-rw-r--r--src/lib/ffmpeg/mathematics.pas14
-rw-r--r--src/lib/ffmpeg/rational.pas20
4 files changed, 37 insertions, 35 deletions
diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 1b23f12b..ea3a1e29 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -25,13 +25,13 @@
*
* libavutil/avutil.h:
* Min. version: 49.0.1, revision 6577, Sat Oct 7 15:30:46 2006 UTC
- * Max. version: 50.19.0, revision 23593, Mon Jul 21 01:00:00 2010 CET
+ * Max. version: 50.21.0, revision 24190, Wed Jul 21 01:00:00 2010 CET
*
* libavutil/mem.h:
- * revision 16590, Tue Jan 13 23:44:16 2009 UTC
+ * revision 23904, Wed Jul 21 01:00:00 2010 CET
*
* libavutil/log.h:
- * revision 16571, Tue Jan 13 00:14:43 2009 UTC
+ * revision 23972, Wed Jul 21 01:00:00 2010 CET
*
* include/keep pixfmt.h (change in revision 50.01.0)
* Maybe, the pixelformats are not needed, but it has not been checked.
@@ -92,7 +92,7 @@ const
*)
(* Max. supported version by this header *)
LIBAVUTIL_MAX_VERSION_MAJOR = 50;
- LIBAVUTIL_MAX_VERSION_MINOR = 19;
+ LIBAVUTIL_MAX_VERSION_MINOR = 21;
LIBAVUTIL_MAX_VERSION_RELEASE = 0;
LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -117,7 +117,7 @@ const
{$IF LIBAVUTIL_VERSION >= 49008000} // 49.8.0
(**
- * Returns the LIBAVUTIL_VERSION_INT constant.
+ * Return the LIBAVUTIL_VERSION_INT constant.
*)
function avutil_version(): cuint;
cdecl; external av__util;
@@ -125,13 +125,13 @@ function avutil_version(): cuint;
{$IF LIBAVUTIL_VERSION >= 50004000} // >= 50.4.0
(**
- * Returns the libavutil build-time configuration.
+ * Return the libavutil build-time configuration.
*)
function avutil_configuration(): PAnsiChar;
cdecl; external av__util;
(**
- * Returns the libavutil license.
+ * Return the libavutil license.
*)
function avutil_license(): PAnsiChar;
cdecl; external av__util;
@@ -334,7 +334,7 @@ function MKBETAG(a, b, c, d: AnsiChar): integer;
(* memory handling functions *)
(**
- * Allocates a block of size bytes with alignment suitable for all
+ * Allocate a block of size bytes with alignment suitable for all
* memory accesses (including vectors if available on the CPU).
* @param size Size in bytes for the memory block to be allocated.
* @return Pointer to the allocated block, NULL if the block cannot
@@ -345,9 +345,9 @@ function av_malloc(size: cuint): pointer;
cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
(**
- * Allocates or reallocates a block of memory.
- * If ptr is NULL and size > 0, allocates a new block. If
- * size is zero, frees the memory block pointed to by ptr.
+ * Allocate or reallocate a block of memory.
+ * If ptr is NULL and size > 0, allocate a new block. If
+ * size is zero, free the memory block pointed to by ptr.
* @param size Size in bytes for the memory block to be allocated or
* reallocated.
* @param ptr Pointer to a memory block already allocated with
@@ -360,7 +360,7 @@ function av_realloc(ptr: pointer; size: cuint): pointer;
cdecl; external av__util; {av_alloc_size(2)}
(**
- * Frees a memory block which has been allocated with av_malloc(z)() or
+ * Free a memory block which has been allocated with av_malloc(z)() or
* av_realloc().
* @param ptr Pointer to the memory block which should be freed.
* @note ptr = NULL is explicitly allowed.
@@ -371,7 +371,7 @@ procedure av_free(ptr: pointer);
cdecl; external av__util;
(**
- * Allocates a block of size bytes with alignment suitable for all
+ * Allocate a block of size bytes with alignment suitable for all
* memory accesses (including vectors if available on the CPU) and
* zeroes all the bytes of the block.
* @param size Size in bytes for the memory block to be allocated.
@@ -382,7 +382,7 @@ function av_mallocz(size: cuint): pointer;
cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
(**
- * Duplicates the string s.
+ * Duplicate the string s.
* @param s string to be duplicated.
* @return Pointer to a newly allocated string containing a
* copy of s or NULL if the string cannot be allocated.
@@ -391,7 +391,7 @@ function av_strdup({const} s: PAnsiChar): PAnsiChar;
cdecl; external av__util; {av_malloc_attrib}
(**
- * Frees a memory block which has been allocated with av_malloc(z)() or
+ * Freesa memory block which has been allocated with av_malloc(z)() or
* av_realloc() and set the pointer pointing to it to NULL.
* @param ptr Pointer to the pointer to the memory block which should
* be freed.
@@ -448,7 +448,7 @@ const
{$IFEND}
(**
- * Sends the specified message to the log if the level is less than or equal
+ * Send the specified message to the log if the level is less than or equal
* to the current av_log_level. By default, all logging messages are sent to
* stderr. This behavior can be altered by setting a different av_vlog callback
* function.
diff --git a/src/lib/ffmpeg/error.pas b/src/lib/ffmpeg/error.pas
index c142f6e1..720005b6 100644
--- a/src/lib/ffmpeg/error.pas
+++ b/src/lib/ffmpeg/error.pas
@@ -19,7 +19,7 @@
* - Changes and updates by the UltraStar Deluxe Team
*
* Conversion of libavutil/error.h
- * Max. avutil version: 50.16.0, revision 23255, Sun May 30 22:05:00 2010 CET
+ * Max. avutil version: 50.21.0, revision 24190, Wed Jul 21 01:00:00 2010 CET
*
*)
@@ -98,11 +98,13 @@ const
{$IF LIBAVUTIL_VERSION >= 50013000} // >= 50.13.0
(*
- * Puts a description of the AVERROR code errnum in errbuf.
+ * Put a description of the AVERROR code errnum in errbuf.
* In case of failure the global variable errno is set to indicate the
* error. Even in case of failure av_strerror() will print a generic
* error message indicating the errnum provided to errbuf.
*
+ * @param errnum error code to describe
+ * @param errbuf buffer to which description is written
* @param errbuf_size the size in bytes of errbuf
* @return 0 on success, a negative value if a description for errnum
* cannot be found
diff --git a/src/lib/ffmpeg/mathematics.pas b/src/lib/ffmpeg/mathematics.pas
index 92e9cbb0..7366117b 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.19.0, revision 23593, Mon Jul 21 01:00:00 2010 CET
+ * avutil max. version 50.21.0, revision 24190, Wed Jul 21 01:00:00 2010 CET
*
*)
@@ -71,7 +71,7 @@ type
{$IF LIBAVUTIL_VERSION >= 49013000} // 49.13.0
(**
- * Returns the greatest common divisor of a and b.
+ * 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
* undefined.
*)
@@ -80,28 +80,28 @@ function av_gcd(a: cint64; b: cint64): cint64;
{$IFEND}
(**
- * Rescales a 64-bit integer with rounding to nearest.
+ * Rescale a 64-bit integer with rounding to nearest.
* A simple a*b/c isn't possible as it can overflow.
*)
function av_rescale (a, b, c: cint64): cint64;
cdecl; external av__util; {av_const}
(**
- * Rescales a 64-bit integer with specified rounding.
+ * Rescale a 64-bit integer with specified rounding.
* A simple a*b/c isn't possible as it can overflow.
*)
function av_rescale_rnd (a, b, c: cint64; enum: TAVRounding): cint64;
cdecl; external av__util; {av_const}
(**
- * Rescales a 64-bit integer by 2 rational numbers.
+ * Rescale a 64-bit integer by 2 rational numbers.
*)
function av_rescale_q (a: cint64; bq, cq: TAVRational): cint64;
cdecl; external av__util; {av_const}
{$IF LIBAVUTIL_VERSION >= 50008000} // 50.8.0
(**
- * Compares 2 timestamps each in its own timebases.
+ * Compare 2 timestamps each in its own timebases.
* The result of the function is undefined if one of the timestamps
* is outside the int64_t range when represented in the others timebase.
* @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
@@ -112,7 +112,7 @@ function av_compare_ts(ts_a: cint64; tb_a: TAVRational; ts_b: cint64; tb_b: TAVR
{$IF LIBAVUTIL_VERSION >= 50018000} // 50.18.0
(**
- * Compares 2 integers modulo mod.
+ * Compare 2 integers modulo mod.
* That is we compare integers a and b for which only the least
* significant log2(mod) bits are known.
*
diff --git a/src/lib/ffmpeg/rational.pas b/src/lib/ffmpeg/rational.pas
index e96fccd6..323d7937 100644
--- a/src/lib/ffmpeg/rational.pas
+++ b/src/lib/ffmpeg/rational.pas
@@ -23,7 +23,7 @@
* - Changes and updates by the UltraStar Deluxe Team
*
* Conversion of libavutil/rational.h
- * avutil max. version 50.16.0, revision 23255, Sun May 30 22:05:00 2010 CET
+ * avutil max. version 50.21.0, revision 24190, Wed Jul 21 01:00:00 2010 CET
*
*)
@@ -59,7 +59,7 @@ type
PAVRationalArray = ^TAVRationalArray;
(**
- * Compares two rationals.
+ * Compare two rationals.
* @param a first rational
* @param b second rational
* @return 0 if a==b, 1 if a>b and -1 if a<b
@@ -67,14 +67,14 @@ type
function av_cmp_q(a: TAVRational; b: TAVRational): cint; {$IFDEF HasInline}inline;{$ENDIF}
(**
- * Converts rational to double.
+ * Convert rational to double.
* @param a rational to convert
* @return (double) a
*)
function av_q2d(a: TAVRational): cdouble; {$IFDEF HasInline}inline;{$ENDIF}
(**
- * Reduces a fraction.
+ * Reduce a fraction.
* This is useful for framerate calculations.
* @param dst_num destination numerator
* @param dst_den destination denominator
@@ -87,7 +87,7 @@ function av_reduce(dst_num: PCint; dst_den: PCint; num: cint64; den: cint64; max
cdecl; external av__util;
(**
- * Multiplies two rationals.
+ * Multiply two rationals.
* @param b first rational
* @param c second rational
* @return b*c
@@ -96,7 +96,7 @@ function av_mul_q(b: TAVRational; c: TAVRational): TAVRational;
cdecl; external av__util; {av_const}
(**
- * Divides one rational by another.
+ * Divide one rational by another.
* @param b first rational
* @param c second rational
* @return b/c
@@ -105,7 +105,7 @@ function av_div_q(b: TAVRational; c: TAVRational): TAVRational;
cdecl; external av__util; {av_const}
(**
- * Adds two rationals.
+ * Add two rationals.
* @param b first rational
* @param c second rational
* @return b+c
@@ -114,7 +114,7 @@ function av_add_q(b: TAVRational; c: TAVRational): TAVRational;
cdecl; external av__util; {av_const}
(**
- * Subtracts one rational from another.
+ * Subtract one rational from another.
* @param b first rational
* @param c second rational
* @return b-c
@@ -123,7 +123,7 @@ function av_sub_q(b: TAVRational; c: TAVRational): TAVRational;
cdecl; external av__util; {av_const}
(**
- * Converts a double precision floating point number to a rational.
+ * Convert a double precision floating point number to a rational.
* @param d double to convert
* @param max the maximum allowed numerator and denominator
* @return (AVRational) d
@@ -140,7 +140,7 @@ function av_nearer_q(q, q1, q2: TAVRational): cint;
cdecl; external av__util;
(**
- * Finds the nearest value in q_list to q.
+ * Find the nearest value in q_list to q.
* @param q_list an array of rationals terminated by {0, 0}
* @return the index of the nearest value found in the array
*)