Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv28876 Modified Files: jpeg_enc.c Log Message: {malloc,free} -> av_{malloc,free} Index: jpeg_enc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jpeg_enc.c 6 Nov 2002 15:19:45 -0000 1.12 +++ jpeg_enc.c 31 Jan 2003 18:03:17 -0000 1.13 @@ -293,12 +293,12 @@ w, h, y_psize, y_rsize, u_psize, u_rsize, v_psize, v_rsize); - j = malloc(sizeof(jpeg_enc_t)); + j = av_malloc(sizeof(jpeg_enc_t)); if (j == NULL) return NULL; - j->s = malloc(sizeof(MpegEncContext)); + j->s = av_malloc(sizeof(MpegEncContext)); if (j->s == NULL) { - free(j); + av_free(j); return NULL; } @@ -343,8 +343,8 @@ } if (mjpeg_init(j->s) < 0) { - free(j->s); - free(j); + av_free(j->s); + av_free(j); return NULL; } @@ -352,8 +352,8 @@ j->s->avctx = calloc(sizeof(*j->s->avctx), 1); if (MPV_common_init(j->s) < 0) { - free(j->s); - free(j); + av_free(j->s); + av_free(j); return NULL; } @@ -496,8 +496,8 @@ void jpeg_enc_uninit(jpeg_enc_t *j) { mjpeg_close(j->s); - free(j->s); - free(j); + av_free(j->s); + av_free(j); } #if 0