Mercurial > mplayer.hg

changeset 36755:1644cfb31b2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vf_screenshot: use av_fast_malloc.
author reimar
date Sun, 16 Feb 2014 14:47:33 +0000
parents 122de2aa583b
children 6e78b4f9569f
files libmpcodecs/vf_screenshot.c
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vf_screenshot.c	Sun Feb 16 14:47:32 2014 +0000
+++ b/libmpcodecs/vf_screenshot.c	Sun Feb 16 14:47:33 2014 +0000
@@ -20,9 +20,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <string.h>
 #include <inttypes.h>
 
@@ -77,8 +74,7 @@
     vf->priv->ctx=sws_getContextFromCmdLine(width, height, outfmt,
                                  d_width, d_height, IMGFMT_RGB24);
 
-    vf->priv->outbuffer_size = d_width * d_height * 3 * 2;
-    vf->priv->outbuffer = realloc(vf->priv->outbuffer, vf->priv->outbuffer_size);
+    av_fast_malloc(&vf->priv->outbuffer, &vf->priv->outbuffer_size, d_width * d_height * 3 * 2);
     vf->priv->avctx->width = d_width;
     vf->priv->avctx->height = d_height;
     vf->priv->avctx->compression_level = 0;
@@ -274,7 +270,7 @@
     if(vf->priv->ctx) sws_freeContext(vf->priv->ctx);
     av_freep(&vf->priv->pic->data[0]);
     av_frame_free(&vf->priv->pic);
-    free(vf->priv->outbuffer);
+    av_freep(&vf->priv->outbuffer);
     free(vf->priv->prefix);
     free(vf->priv);
 }