diff options
author | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-31 18:03:17 +0000 |
---|---|---|
committer | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-31 18:03:17 +0000 |
commit | cb13f40e63148c575ff66b6b9ae9c7edf810c833 (patch) | |
tree | a961b9a5250838000097326fafaa54618ea00cfc /libvo/jpeg_enc.c | |
parent | 06acc137014d86be631ca65796787e7e358c2e97 (diff) | |
download | mpv-cb13f40e63148c575ff66b6b9ae9c7edf810c833.tar.bz2 mpv-cb13f40e63148c575ff66b6b9ae9c7edf810c833.tar.xz |
{malloc,free} -> av_{malloc,free}
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9187 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/jpeg_enc.c')
-rw-r--r-- | libvo/jpeg_enc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index 595beac30c..713f9ce8e7 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -293,12 +293,12 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, 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 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, } if (mjpeg_init(j->s) < 0) { - free(j->s); - free(j); + av_free(j->s); + av_free(j); return NULL; } @@ -352,8 +352,8 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, 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 @@ int jpeg_enc_frame(jpeg_enc_t *j, unsigned char *y_data, 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 |