From 38cdf2cd93ee7ff0bf224a9577f995e354ffb147 Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 3 Jul 2008 18:47:28 +0000 Subject: ffmpeg pascal header 64bit compatibility fix. Further headers will follow. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1160 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/ffmpeg/avutil.pas | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'Game/Code/lib/ffmpeg/avutil.pas') diff --git a/Game/Code/lib/ffmpeg/avutil.pas b/Game/Code/lib/ffmpeg/avutil.pas index 4e9990e3..b7c8989c 100644 --- a/Game/Code/lib/ffmpeg/avutil.pas +++ b/Game/Code/lib/ffmpeg/avutil.pas @@ -52,6 +52,7 @@ unit avutil; interface uses + ctypes, mathematics, rational, UConfig; @@ -82,14 +83,6 @@ const {$MESSAGE Warn 'Linked version of libavutil may be unsupported!'} {$IFEND} - -{$IFDEF FPC} -{$IF FPC_VERSION_INT < 2002000} // < 2.2.0 -type - uint64 = QWord; -{$IFEND} -{$ENDIF} - type (** * Pixel format. Notes: @@ -193,7 +186,7 @@ function MKTAG(a,b,c,d: char): integer; * it. * @see av_mallocz() *) -function av_malloc (size: cardinal): pointer; +function av_malloc(size: cuint): pointer; cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)} (** @@ -208,7 +201,7 @@ function av_malloc (size: cardinal): pointer; * reallocate or the function is used to free the memory block. * @see av_fast_realloc() *) -function av_realloc (ptr: pointer; size: cardinal): pointer; +function av_realloc(ptr: pointer; size: cuint): pointer; cdecl; external av__util; {av_alloc_size(2)} (** @@ -219,7 +212,7 @@ function av_realloc (ptr: pointer; size: cardinal): pointer; * @note It is recommended that you use av_freep() instead. * @see av_freep() *) -procedure av_free (ptr: pointer); +procedure av_free(ptr: pointer); cdecl; external av__util; (** @@ -231,7 +224,7 @@ procedure av_free (ptr: pointer); * it. * @see av_malloc() *) -function av_mallocz (size: cardinal): pointer; +function av_mallocz(size: cuint): pointer; cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)} (** @@ -240,7 +233,7 @@ function av_mallocz (size: cardinal): pointer; * @return Pointer to a newly allocated string containing a * copy of \p s or NULL if it cannot be allocated. *) -function av_strdup({const} s: pchar): pchar; +function av_strdup({const} s: PChar): PChar; cdecl; external av__util; {av_malloc_attrib} (** @@ -300,9 +293,9 @@ const AV_LOG_DEBUG = 48; {$IFEND} -function av_log_get_level(): integer; +function av_log_get_level(): cint; cdecl; external av__util; -procedure av_log_set_level(level: integer); +procedure av_log_set_level(level: cint); cdecl; external av__util; -- cgit v1.2.3