update/fix mem.pas

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2961 b956fd51-792f-4845-bead-9b4dfca2ff2c

4 files changed, 93 insertions, 2 deletions

diff --git a/src/lib/ffmpeg-0.10/libavutil/mem.pas b/src/lib/ffmpeg-0.10/libavutil/mem.pas
index d59b9a46..90355f0b 100644
--- a/src/lib/ffmpeg-0.10/libavutil/mem.pas
+++ b/src/lib/ffmpeg-0.10/libavutil/mem.pas
@@ -145,3 +145,10 @@ procedure av_dynarray_add(tab_ptr: pointer; nb_ptr: PCint; elem: pointer);
     *r = t;
     return 0;
 }
+
+(**
+ * Set the maximum size that may me allocated in one block.
+ *)
+procedure av_max_alloc(max: size_t);
+  cdecl; external av__util;
+
diff --git a/src/lib/ffmpeg-0.11/libavutil/mem.pas b/src/lib/ffmpeg-0.11/libavutil/mem.pas
index 5144b709..cc6843d5 100644
--- a/src/lib/ffmpeg-0.11/libavutil/mem.pas
+++ b/src/lib/ffmpeg-0.11/libavutil/mem.pas
@@ -145,3 +145,10 @@ procedure av_dynarray_add(tab_ptr: pointer; nb_ptr: PCint; elem: pointer);
     *r = t;
     return 0;
 }
+
+(**
+ * Set the maximum size that may me allocated in one block.
+ *)
+procedure av_max_alloc(max: size_t);
+  cdecl; external av__util;
+
diff --git a/src/lib/ffmpeg-1.0/libavutil/mem.pas b/src/lib/ffmpeg-1.0/libavutil/mem.pas
index 5144b709..af2262ee 100644
--- a/src/lib/ffmpeg-1.0/libavutil/mem.pas
+++ b/src/lib/ffmpeg-1.0/libavutil/mem.pas
@@ -19,7 +19,7 @@
  * - Changes and updates by the UltraStar Deluxe Team
  *
  * Conversion of libavutil/mem.h
- * avutil version 51.54.100
+ * avutil version 51.73.101
  *
  *)
 
@@ -42,6 +42,18 @@ function av_malloc(size: size_t): pointer;
   cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
 
 (**
+ * Helper function to allocate a block of size * nmemb bytes with
+ * using av_malloc()
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_malloc()
+ *)
+function av_malloc_array(nmemb: size_t; size: size_t): pointer; {$IFDEF HasInline}inline;{$ENDIF} {av_alloc_size(1,2)}
+// Note: defined in avutil.pas
+
+(**
  * 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.
@@ -103,6 +115,19 @@ function av_calloc(nmemb: size_t; size: size_t): pointer;
   cdecl; external av__util; {av_malloc_attrib}
 
 (**
+ * Helper function to allocate a block of size * nmemb bytes with
+ * using av_mallocz()
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_mallocz()
+ * @see av_malloc_array()
+ *)
+function av_mallocz_array(nmemb: size_t; size: size_t): pointer; {$IFDEF HasInline}inline;{$ENDIF} {av_alloc_size(1,2)}
+// Note: defined in avutil.pas
+
+(**
  * Duplicate the string s.
  * @param s string to be duplicated.
  * @return Pointer to a newly allocated string containing a
@@ -145,3 +170,11 @@ procedure av_dynarray_add(tab_ptr: pointer; nb_ptr: PCint; elem: pointer);
     *r = t;
     return 0;
 }
+
+(**
+ * Set the maximum size that may me allocated in one block.
+ *)
+procedure av_max_alloc(max: size_t);
+  cdecl; external av__util;
+
+  
\ No newline at end of file
diff --git a/src/lib/ffmpeg-1.1/libavutil/mem.pas b/src/lib/ffmpeg-1.1/libavutil/mem.pas
index 5144b709..db22c82f 100644
--- a/src/lib/ffmpeg-1.1/libavutil/mem.pas
+++ b/src/lib/ffmpeg-1.1/libavutil/mem.pas
@@ -19,7 +19,7 @@
  * - Changes and updates by the UltraStar Deluxe Team
  *
  * Conversion of libavutil/mem.h
- * avutil version 51.54.100
+ * avutil version 52.13.100
  *
  *)
 
@@ -42,6 +42,18 @@ function av_malloc(size: size_t): pointer;
   cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
 
 (**
+ * Helper function to allocate a block of size * nmemb bytes with
+ * using av_malloc()
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_malloc()
+ *)
+function av_malloc_array(nmemb: size_t; size: size_t): pointer; {$IFDEF HasInline}inline;{$ENDIF} {av_alloc_size(1, 2)}
+// Note: defined in avutil.pas
+
+(**
  * 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.
@@ -103,6 +115,19 @@ function av_calloc(nmemb: size_t; size: size_t): pointer;
   cdecl; external av__util; {av_malloc_attrib}
 
 (**
+ * Helper function to allocate a block of size * nmemb bytes with
+ * using av_mallocz()
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_mallocz()
+ * @see av_malloc_array()
+ *)
+function av_mallocz_array(nmemb: size_t; size: size_t): pointer; {$IFDEF HasInline}inline;{$ENDIF} {av_alloc_size(1, 2)}
+// Note: defined in avutil.pas
+
+(**
  * Duplicate the string s.
  * @param s string to be duplicated.
  * @return Pointer to a newly allocated string containing a
@@ -145,3 +170,22 @@ procedure av_dynarray_add(tab_ptr: pointer; nb_ptr: PCint; elem: pointer);
     *r = t;
     return 0;
 }
+
+(**
+ * Set the maximum size that may me allocated in one block.
+ *)
+procedure av_max_alloc(max: size_t);
+  cdecl; external av__util;
+
+(**
+ * @brief deliberately overlapping memcpy implementation
+ * @param dst destination buffer
+ * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0
+ * @param cnt number of bytes to copy, must be >= 0
+ *
+ * cnt > back is valid, this will copy the bytes we just copied,
+ * thus creating a repeating pattern with a period length of back.
+ *)
+procedure av_memcpy_backptr(dst: Pcuint8; back: cint; cnt: cint);
+  cdecl; external av__util;
+