virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

lavc: use av_freep() for freeing extended_data

Browse Source 
This is safer

Reviewed-by: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-01-17 03:11:45 +01:00
parent 24860a913c
commit af5004b557
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/utils.c
View File

@ -296,7 +296,7 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
buf, nb_channels, frame->nb_samples,
sample_fmt, align)) < 0) {
if (frame->extended_data != frame->data)
av_free(frame->extended_data);
av_freep(&frame->extended_data);
return ret;
}
if (frame->extended_data != frame->data) {
@ -334,7 +334,7 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
if (buf->extended_data[0] && buf_size > buf->audio_data_size) {
av_free(buf->extended_data[0]);
if (buf->extended_data != buf->data)
av_free(&buf->extended_data);
av_freep(&buf->extended_data);
buf->extended_data = NULL;
buf->data[0] = NULL;
}
@ -1110,7 +1110,7 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
}
if (frame && frame->extended_data != frame->data)
av_free(frame->extended_data);
av_freep(&frame->extended_data);
return ret ? ret : pkt.size;
}
@ -1733,7 +1733,7 @@ static void audio_free_buffers(AVCodecContext *avctx)
if (buf->extended_data) {
av_free(buf->extended_data[0]);
if (buf->extended_data != buf->data)
av_free(buf->extended_data);
av_freep(&buf->extended_data);
}
av_freep(&avci->buffer);
}