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

lavc/utils: check return value of avcodec_fill_audio_frame() for < 0

Browse Source 
Assume that the value is always negative in case of error, as stated in
the docs, do not assume that the value cannot be != 0 in case of success.
This commit is contained in:
Stefano Sabatini 2012-11-25 19:47:54 +01:00
parent 51e9f58e1c
commit e55c3857d2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/utils.c
View File

@ -418,7 +418,7 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
} }
if ((ret = avcodec_fill_audio_frame(frame, avctx->channels, if ((ret = avcodec_fill_audio_frame(frame, avctx->channels,
avctx->sample_fmt, buf->data[0], avctx->sample_fmt, buf->data[0],
buf->audio_data_size, 0))) buf->audio_data_size, 0)) < 0)
return ret; return ret;
if (frame->extended_data == frame->data) if (frame->extended_data == frame->data)
@ -1383,7 +1383,7 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
if ((ret = avcodec_fill_audio_frame(frame, avctx->channels, if ((ret = avcodec_fill_audio_frame(frame, avctx->channels,
avctx->sample_fmt, avctx->sample_fmt,
(const uint8_t *)samples, (const uint8_t *)samples,
samples_size, 1))) samples_size, 1)) < 0)
return ret; return ret;
/* fabricate frame pts from sample count. /* fabricate frame pts from sample count.