generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc/utils: check av_frame_alloc() failure.

Browse Source
This commit is contained in:
Nicolas George 2013-12-29 10:42:54 +01:00
parent a55692a960
commit 38004051b5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/utils.c
View File

@ -1721,6 +1721,8 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
if (samples) { if (samples) {
frame = av_frame_alloc(); frame = av_frame_alloc();
if (!frame)
return AVERROR(ENOMEM);
if (avctx->frame_size) { if (avctx->frame_size) {
frame->nb_samples = avctx->frame_size; frame->nb_samples = avctx->frame_size;
@ -2158,6 +2160,8 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
AVFrame *frame = av_frame_alloc(); AVFrame *frame = av_frame_alloc();
int ret, got_frame = 0; int ret, got_frame = 0;
if (!frame)
return AVERROR(ENOMEM);
if (avctx->get_buffer != avcodec_default_get_buffer) { if (avctx->get_buffer != avcodec_default_get_buffer) {
av_log(avctx, AV_LOG_ERROR, "Custom get_buffer() for use with" av_log(avctx, AV_LOG_ERROR, "Custom get_buffer() for use with"
"avcodec_decode_audio3() detected. Overriding with avcodec_default_get_buffer\n"); "avcodec_decode_audio3() detected. Overriding with avcodec_default_get_buffer\n");