From c8313d75d266318354df56ed5beb11e5a8ac3f7f Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 22 Apr 2012 00:02:46 +0000 Subject: some updates. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2861 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-0.7/avutil.pas | 5 ----- src/lib/ffmpeg-0.7/libavutil/log.pas | 5 +++-- src/lib/ffmpeg-0.7/libavutil/pixfmt.pas | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lib/ffmpeg-0.7/avutil.pas b/src/lib/ffmpeg-0.7/avutil.pas index 6dd0643f..760ad4e1 100644 --- a/src/lib/ffmpeg-0.7/avutil.pas +++ b/src/lib/ffmpeg-0.7/avutil.pas @@ -26,9 +26,6 @@ * libavutil/avutil.h: * version: 50.43.0 * - * include/keep pixfmt.h (change in revision 50.01.0) - * Maybe, the pixelformats are not needed, but it has not been checked. - * *) unit avutil; @@ -73,7 +70,6 @@ const (LIBAVUTIL_MIN_VERSION_RELEASE * VERSION_RELEASE); (* Check if linked versions are supported *) -(* {$IF (LIBAVUTIL_VERSION < LIBAVUTIL_MIN_VERSION)} {$MESSAGE Error 'Linked version of libavutil is too old!'} {$IFEND} @@ -81,7 +77,6 @@ const {$IF (LIBAVUTIL_VERSION > LIBAVUTIL_MAX_VERSION)} {$MESSAGE Error 'Linked version of libavutil is not yet supported!'} {$IFEND} -*) (** * Return the LIBAVUTIL_VERSION_INT constant. diff --git a/src/lib/ffmpeg-0.7/libavutil/log.pas b/src/lib/ffmpeg-0.7/libavutil/log.pas index f2df66f0..690d0daf 100644 --- a/src/lib/ffmpeg-0.7/libavutil/log.pas +++ b/src/lib/ffmpeg-0.7/libavutil/log.pas @@ -46,7 +46,7 @@ type * A pointer to a function which returns the name of a context * instance ctx associated with the class. *) - item_name: function(): PAnsiChar; cdecl; + item_name: function(ctx: pointer): PAnsiChar; cdecl; (** * a pointer to the first option specified in the class if any or NULL @@ -80,7 +80,8 @@ type * A function for extended searching, e.g. in possible * children objects. *) - opt_find: function(): PAVOption; cdecl; + opt_find: function(obj: pointer; name: {const} PAnsiChar; unit: {const} PAnsiChar; + opt_flags: cint; search_flags: cint): PAVOption; cdecl; end; diff --git a/src/lib/ffmpeg-0.7/libavutil/pixfmt.pas b/src/lib/ffmpeg-0.7/libavutil/pixfmt.pas index 82288cbb..d47ef354 100644 --- a/src/lib/ffmpeg-0.7/libavutil/pixfmt.pas +++ b/src/lib/ffmpeg-0.7/libavutil/pixfmt.pas @@ -18,7 +18,7 @@ * This is a part of the Pascal port of ffmpeg. * - Changes and updates by the UltraStar Deluxe Team * - * Conversion of libavutil/mem.h + * Conversion of libavutil/pixfmt.h * avutil version 50.43.0 * *) -- cgit v1.2.3