aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ffmpeg-0.10/libavutil/mem.pas
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-06-09 11:15:48 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-06-09 11:15:48 +0000
commit5d1d06acda578ffcfa6beb3bc5876ad332110dfc (patch)
tree2d6bfb83ce36ac63f4fe6aaee416fa24f3031341 /src/lib/ffmpeg-0.10/libavutil/mem.pas
parent829b0bb438e104b35d3deb461bcc02e9225dc2aa (diff)
downloadusdx-5d1d06acda578ffcfa6beb3bc5876ad332110dfc.tar.gz
usdx-5d1d06acda578ffcfa6beb3bc5876ad332110dfc.tar.xz
usdx-5d1d06acda578ffcfa6beb3bc5876ad332110dfc.zip
update and additions to ffmpeg-0.10
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2892 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg-0.10/libavutil/mem.pas4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/ffmpeg-0.10/libavutil/mem.pas b/src/lib/ffmpeg-0.10/libavutil/mem.pas
index d163d9df..d59b9a46 100644
--- a/src/lib/ffmpeg-0.10/libavutil/mem.pas
+++ b/src/lib/ffmpeg-0.10/libavutil/mem.pas
@@ -64,7 +64,7 @@ function av_realloc(ptr: pointer; size: size_t): 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;".
*)
-function av_realloc_f(ptr: pointer; nelem: size_t; size: size_t): pointer;
+function av_realloc_f(ptr: pointer; nelem: size_t; elsize: size_t): pointer;
cdecl; external av__util;
(**
@@ -135,9 +135,7 @@ procedure av_dynarray_add(tab_ptr: pointer; nb_ptr: PCint; elem: pointer);
* Multiply two size_t values checking for overflow.
* @return 0 if success, AVERROR(EINVAL) if overflow.
*)
-{ available only in 0.8.5 - 0.8.10
//static inline int av_size_mult(size_t a, size_t b, size_t *r)
-}
{
size_t t = a * b;
/* Hack inspired from glibc: only try the division if nelem and elsize