[FFmpeg-cvslog] avutil/mem: simplify av_reallocp_array() by using av_realloc_f()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  5 14:40:31 2013 +0200| [fbc472da295e50c9bfa667f56a261e4d7acb1ccb] | committer: Michael Niedermayer

avutil/mem: simplify av_reallocp_array() by using av_realloc_f()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbc472da295e50c9bfa667f56a261e4d7acb1ccb
---

 libavutil/mem.c |   14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 1f2b0c3..76f6b65 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -190,19 +190,9 @@ void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
 int av_reallocp_array(void *ptr, size_t nmemb, size_t size)
 {
     void **ptrptr = ptr;
-    void *ret;
-    if (size <= 0 || nmemb >= INT_MAX / size)
-        return AVERROR(ENOMEM);
-    if (nmemb <= 0) {
-        av_freep(ptr);
-        return 0;
-    }
-    ret = av_realloc(*ptrptr, nmemb * size);
-    if (!ret) {
-        av_freep(ptr);
+    *ptrptr = av_realloc_f(*ptrptr, nmemb, size);
+    if (!*ptrptr && !(nmemb && size))
         return AVERROR(ENOMEM);
-    }
-    *ptrptr = ret;
     return 0;
 }