[MPlayer-cvslog] CVS: main/libmpcodecs ad_ffmpeg.c, 1.16, 1.17 vd_ffmpeg.c, 1.139, 1.140 ve_lavc.c, 1.106, 1.107
Reimar Döffinger CVS
syncmail at mplayerhq.hu
Sat Jan 8 20:16:24 CET 2005
CVS change done by Reimar Döffinger CVS
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv30499/libmpcodecs
Modified Files:
ad_ffmpeg.c vd_ffmpeg.c ve_lavc.c
Log Message:
change malloc and free to av_ variants where needed.
Index: ad_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ad_ffmpeg.c 21 Sep 2004 20:34:46 -0000 1.16
+++ ad_ffmpeg.c 8 Jan 2005 19:16:21 -0000 1.17
@@ -72,7 +72,7 @@
/* alloc extra data */
if (sh_audio->wf && sh_audio->wf->cbSize > 0) {
- lavc_context->extradata = malloc(sh_audio->wf->cbSize);
+ lavc_context->extradata = av_malloc(sh_audio->wf->cbSize);
lavc_context->extradata_size = sh_audio->wf->cbSize;
memcpy(lavc_context->extradata, (char *)sh_audio->wf + sizeof(WAVEFORMATEX),
lavc_context->extradata_size);
@@ -120,9 +120,8 @@
if (avcodec_close(lavc_context) < 0)
mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantCloseCodec);
- if (lavc_context->extradata)
- free(lavc_context->extradata);
- free(lavc_context);
+ av_freep(&lavc_context->extradata);
+ av_freep(&lavc_context);
}
static int control(sh_audio_t *sh,int cmd,void* arg, ...)
Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- vd_ffmpeg.c 17 Dec 2004 07:34:23 -0000 1.139
+++ vd_ffmpeg.c 8 Jan 2005 19:16:21 -0000 1.140
@@ -281,7 +281,7 @@
{
avctx->flags |= CODEC_FLAG_EXTERN_HUFF;
avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
- avctx->extradata = malloc(avctx->extradata_size);
+ avctx->extradata = av_malloc(avctx->extradata_size);
memcpy(avctx->extradata, sh->bih+sizeof(BITMAPINFOHEADER),
avctx->extradata_size);
@@ -303,7 +303,7 @@
|| sh->format == mmioFOURCC('R', 'V', '4', '0')
){
avctx->extradata_size= 8;
- avctx->extradata = malloc(avctx->extradata_size);
+ avctx->extradata = av_malloc(avctx->extradata_size);
if(sh->bih->biSize!=sizeof(*sh->bih)+8){
/* only 1 packet per frame & sub_id from fourcc */
((uint32_t*)avctx->extradata)[0] = 0;
@@ -338,7 +338,7 @@
))
{
avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);
- avctx->extradata = malloc(avctx->extradata_size);
+ avctx->extradata = av_malloc(avctx->extradata_size);
memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
}
/* Pass palette to codec */
@@ -359,7 +359,7 @@
if (sh->ImageDesc &&
sh->format == mmioFOURCC('S','V','Q','3')){
avctx->extradata_size = (*(int*)sh->ImageDesc) - sizeof(int);
- avctx->extradata = malloc(avctx->extradata_size);
+ avctx->extradata = av_malloc(avctx->extradata_size);
memcpy(avctx->extradata, ((int*)sh->ImageDesc)+1, avctx->extradata_size);
}
@@ -395,22 +395,14 @@
if (avcodec_close(avctx) < 0)
mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantCloseCodec);
- if (avctx->extradata_size)
- free(avctx->extradata);
- avctx->extradata=NULL;
+ av_freep(&avctx->extradata);
#if LIBAVCODEC_BUILD >= 4689
- if (avctx->palctrl)
- free(avctx->palctrl);
- avctx->palctrl=NULL;
-#endif
- if(avctx->slice_offset!=NULL)
- free(avctx->slice_offset);
- avctx->slice_offset=NULL;
-
- if (avctx)
- free(avctx);
- if (ctx->pic)
- free(ctx->pic);
+ av_freep(&avctx->palctrl);
+#endif
+ av_freep(&avctx->slice_offset);
+
+ av_freep(&avctx);
+ av_freep(&ctx->pic);
if (ctx)
free(ctx);
}
@@ -601,7 +593,7 @@
#if LIBAVCODEC_BUILD >= 4689
// Palette support: libavcodec copies palette to *data[1]
if (mpi->bpp == 8)
- mpi->planes[1] = malloc(AVPALETTE_SIZE);
+ mpi->planes[1] = av_malloc(AVPALETTE_SIZE);
#endif
pic->data[0]= mpi->planes[0];
@@ -677,8 +669,8 @@
}
// Palette support: free palette buffer allocated in get_buffer
- if ( mpi && (mpi->bpp == 8) && (mpi->planes[1] != NULL))
- free(mpi->planes[1]);
+ if ( mpi && (mpi->bpp == 8))
+ av_freep(&mpi->planes[1]);
#if LIBAVCODEC_BUILD >= 4644
if(pic->type!=FF_BUFFER_TYPE_USER){
@@ -751,7 +743,7 @@
dp_hdr_t *hdr= (dp_hdr_t*)data;
if(avctx->slice_offset==NULL)
- avctx->slice_offset= malloc(sizeof(int)*1000);
+ avctx->slice_offset= av_malloc(sizeof(int)*1000);
// for(i=0; i<25; i++) printf("%02X ", ((uint8_t*)data)[i]);
Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- ve_lavc.c 1 Dec 2004 20:32:05 -0000 1.106
+++ ve_lavc.c 8 Jan 2005 19:16:21 -0000 1.107
@@ -437,7 +437,7 @@
char *tmp;
lavc_venc_context->intra_matrix =
- malloc(sizeof(*lavc_venc_context->intra_matrix)*64);
+ av_malloc(sizeof(*lavc_venc_context->intra_matrix)*64);
i = 0;
while ((tmp = strsep(&lavc_param_intra_matrix, ",")) && (i < 64))
@@ -448,10 +448,7 @@
}
if (i != 64)
- {
- free(lavc_venc_context->intra_matrix);
- lavc_venc_context->intra_matrix = NULL;
- }
+ av_freep(&lavc_venc_context->intra_matrix);
else
mp_msg(MSGT_MENCODER, MSGL_V, "Using user specified intra matrix\n");
}
@@ -460,7 +457,7 @@
char *tmp;
lavc_venc_context->inter_matrix =
- malloc(sizeof(*lavc_venc_context->inter_matrix)*64);
+ av_malloc(sizeof(*lavc_venc_context->inter_matrix)*64);
i = 0;
while ((tmp = strsep(&lavc_param_inter_matrix, ",")) && (i < 64))
@@ -471,10 +468,7 @@
}
if (i != 64)
- {
- free(lavc_venc_context->inter_matrix);
- lavc_venc_context->inter_matrix = NULL;
- }
+ av_freep(&lavc_venc_context->inter_matrix);
else
mp_msg(MSGT_MENCODER, MSGL_V, "Using user specified inter matrix\n");
}
@@ -652,7 +646,7 @@
size= ftell(stats_file);
fseek(stats_file, 0, SEEK_SET);
- lavc_venc_context->stats_in= malloc(size + 1);
+ lavc_venc_context->stats_in= av_malloc(size + 1);
lavc_venc_context->stats_in[size]=0;
if(fread(lavc_venc_context->stats_in, size, 1, stats_file)<1){
@@ -728,8 +722,7 @@
}
/* free second pass buffer, its not needed anymore */
- if(lavc_venc_context->stats_in) free(lavc_venc_context->stats_in);
- lavc_venc_context->stats_in= NULL;
+ av_freep(&lavc_venc_context->stats_in);
if(lavc_venc_context->bits_per_sample)
mux_v->bih->biBitCount= lavc_venc_context->bits_per_sample;
if(lavc_venc_context->extradata_size){
@@ -907,12 +900,8 @@
#endif
#if LIBAVCODEC_BUILD >= 4675
- if (lavc_venc_context->intra_matrix)
- free(lavc_venc_context->intra_matrix);
- lavc_venc_context->intra_matrix = NULL;
- if (lavc_venc_context->inter_matrix)
- free(lavc_venc_context->inter_matrix);
- lavc_venc_context->inter_matrix = NULL;
+ av_freep(&lavc_venc_context->intra_matrix);
+ av_freep(&lavc_venc_context->inter_matrix);
#endif
avcodec_close(lavc_venc_context);
@@ -920,11 +909,9 @@
if(stats_file) fclose(stats_file);
/* free rc_override */
- if(lavc_venc_context->rc_override) free(lavc_venc_context->rc_override);
- lavc_venc_context->rc_override= NULL;
+ av_freep(&lavc_venc_context->rc_override);
- if(vf->priv->context) free(vf->priv->context);
- vf->priv->context= NULL;
+ av_freep(&vf->priv->context);
}
//===========================================================================//
More information about the MPlayer-cvslog
mailing list