From c03bb84ce50794bab234b1c5cbfa74f6e8e3c6f2 Mon Sep 17 00:00:00 2001
From: lotanrm <lotanrm@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 17 May 2012 17:32:26 +0000
Subject: Added support for ffmpeg-0.10.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2883 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg-0.10/libavutil/mem.pas | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/lib/ffmpeg-0.10/libavutil/mem.pas')

diff --git a/src/lib/ffmpeg-0.10/libavutil/mem.pas b/src/lib/ffmpeg-0.10/libavutil/mem.pas
index d71dd3d3..d163d9df 100644
--- a/src/lib/ffmpeg-0.10/libavutil/mem.pas
+++ b/src/lib/ffmpeg-0.10/libavutil/mem.pas
@@ -38,22 +38,22 @@
  * be allocated.
  * @see av_mallocz()
  *)
-function av_malloc(size: FF_INTERNAL_MEM_TYPE): pointer;
+function av_malloc(size: size_t): pointer;
   cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
 
 (**
  * 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
  * av_malloc(z)() or av_realloc() or NULL.
+ * @param size Size in bytes for the memory block to be allocated or
+ * reallocated.
  * @return Pointer to a newly reallocated block or NULL if the block
  * cannot be allocated or the function is used to free the memory block.
  * @see av_fast_realloc()
  *)
-function av_realloc(ptr: pointer; size: FF_INTERNAL_MEM_TYPE): pointer;
+function av_realloc(ptr: pointer; size: size_t): pointer;
   cdecl; external av__util; {av_alloc_size(2)}
 
 (**
@@ -64,10 +64,8 @@ function av_realloc(ptr: pointer; size: FF_INTERNAL_MEM_TYPE): pointer;
  * - It frees the input block in case of failure, thus avoiding the memory
  *   leak with the classic "buf = realloc(buf); if (!buf) return -1;".
  *)
-{ available only in 0.8.5 - 0.8.10
 function av_realloc_f(ptr: pointer; nelem: size_t; size: size_t): pointer;
   cdecl; external av__util;
-}
 
 (**
  * Free a memory block which has been allocated with av_malloc(z)() or
@@ -88,7 +86,7 @@ procedure av_free(ptr: pointer);
  * @return Pointer to the allocated block, NULL if it cannot be allocated.
  * @see av_malloc()
  *)
-function av_mallocz(size: FF_INTERNAL_MEM_TYPE): pointer;
+function av_mallocz(size: size_t): pointer;
   cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
 
 (**
@@ -101,10 +99,8 @@ function av_mallocz(size: FF_INTERNAL_MEM_TYPE): pointer;
  * @param size
  * @return Pointer to the allocated block, NULL if it cannot be allocated.
  *)
-(* available only in 0.8.5 - 0.8.10
 function av_calloc(nmemb: size_t; size: size_t): pointer;
   cdecl; external av__util; {av_malloc_attrib}
-*)
 
 (**
  * Duplicate the string s.
-- 
cgit v1.2.3