xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-22 13:21:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use av_malloc instead of plain malloc where appropriate

Browse Source 
Patch by Ramiro Polla % ramiro86 A hotmail.com %
Original thread:
Date: Aug 20, 2006 5:00 AM
Subject: [Ffmpeg-devel] [PATCH] plain malloc in output_example.c

Originally committed as revision 6125 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2006-08-29 12:09:00 +00:00 committed by Guillaume Poirier
parent c5e331155c
commit 5d915e827e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
output_example.c
View File

@ -103,7 +103,7 @@ static void open_audio(AVFormatContext *oc, AVStream *st)
tincr2 = 2 * M_PI * 110.0 / c->sample_rate / c->sample_rate; tincr2 = 2 * M_PI * 110.0 / c->sample_rate / c->sample_rate;
audio_outbuf_size = 10000; audio_outbuf_size = 10000;
audio_outbuf = malloc(audio_outbuf_size); audio_outbuf = av_malloc(audio_outbuf_size);
/* ugly hack for PCM codecs (will be removed ASAP with new PCM /* ugly hack for PCM codecs (will be removed ASAP with new PCM
support to compute the input frame size in samples */ support to compute the input frame size in samples */
@ -122,7 +122,7 @@ static void open_audio(AVFormatContext *oc, AVStream *st)
} else { } else {
audio_input_frame_size = c->frame_size; audio_input_frame_size = c->frame_size;
} }
samples = malloc(audio_input_frame_size * 2 * c->channels); samples = av_malloc(audio_input_frame_size * 2 * c->channels);
} }
/* prepare a 16 bit dummy audio frame of 'frame_size' samples and /* prepare a 16 bit dummy audio frame of 'frame_size' samples and
@ -237,7 +237,7 @@ static AVFrame *alloc_picture(int pix_fmt, int width, int height)
if (!picture) if (!picture)
return NULL; return NULL;
size = avpicture_get_size(pix_fmt, width, height); size = avpicture_get_size(pix_fmt, width, height);
picture_buf = malloc(size); picture_buf = av_malloc(size);
if (!picture_buf) { if (!picture_buf) {
av_free(picture); av_free(picture);
return NULL; return NULL;
@ -271,8 +271,12 @@ static void open_video(AVFormatContext *oc, AVStream *st)
if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) { if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) {
/* allocate output buffer */ /* allocate output buffer */
/* XXX: API change will be done */ /* XXX: API change will be done */
/* buffers passed into lav* can be allocated any way you prefer,
as long as they're aligned enough for the architecture, and
they're freed appropriately (such as using av_free for buffers
allocated with av_malloc) */
video_outbuf_size = 200000; video_outbuf_size = 200000;
video_outbuf = malloc(video_outbuf_size); video_outbuf = av_malloc(video_outbuf_size);
} }
/* allocate the encoded raw picture */ /* allocate the encoded raw picture */