RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

proper memory handling functions 

Originally committed as revision 520 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-05-18 22:59:50 +00:00
parent 61a4e8ae3b
commit 3123dd793e
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavcodec/utils.c
View File

@ -16,21 +16,15 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include "common.h"
#include "dsputil.h"
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#ifdef HAVE_MALLOC_H #ifdef HAVE_MALLOC_H
#include <malloc.h> #include <malloc.h>
#else
#include <stdlib.h>
#endif #endif
/* memory alloc */ /* memory alloc */
void *av_mallocz(int size) void *av_malloc(int size)
{ {
void *ptr; void *ptr;
#if defined ( ARCH_X86 ) && defined ( HAVE_MEMALIGN ) #if defined ( ARCH_X86 ) && defined ( HAVE_MEMALIGN )
@ -53,6 +47,24 @@ void *av_mallocz(int size)
return ptr; return ptr;
} }
void *av_mallocz(int size)
{
void *ptr;
ptr = av_malloc(size);
if (!ptr)
return NULL;
memset(ptr, 0, size);
return ptr;
}
/* NOTE: ptr = NULL is explicetly allowed */
void av_free(void *ptr)
{
/* XXX: this test should not be needed on most libcs */
if (ptr)
free(ptr);
}
/* encoder management */ /* encoder management */
AVCodec *first_avcodec; AVCodec *first_avcodec;
@ -80,9 +92,7 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec)
} }
ret = avctx->codec->init(avctx); ret = avctx->codec->init(avctx);
if (ret < 0) { if (ret < 0) {
if (avctx->priv_data) av_freep(&avctx->priv_data);
free(avctx->priv_data);
avctx->priv_data = NULL;
return ret; return ret;
} }
return 0; return 0;
@ -144,8 +154,7 @@ int avcodec_close(AVCodecContext *avctx)
{ {
if (avctx->codec->close) if (avctx->codec->close)
avctx->codec->close(avctx); avctx->codec->close(avctx);
free(avctx->priv_data); av_freep(&avctx->priv_data);
avctx->priv_data = NULL;
avctx->codec = NULL; avctx->codec = NULL;
return 0; return 0;
} }