ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Aug 10 00:03:13 2014 +0200| [6fac4826249d8f3fd5ac5fd0a3e44893c58ccef6] | committer: Michael Niedermayer
avcodec/flacdec: fix handling of av_samples_fill_arrays() return value Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6fac4826249d8f3fd5ac5fd0a3e44893c58ccef6 --- libavcodec/flacdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index b8d45b8..c9dbc14 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -130,6 +130,7 @@ static void dump_headers(AVCodecContext *avctx, FLACStreaminfo *s) static int allocate_buffers(FLACContext *s) { int buf_size; + int ret; av_assert0(s->max_blocksize); @@ -142,9 +143,10 @@ static int allocate_buffers(FLACContext *s) if (!s->decoded_buffer) return AVERROR(ENOMEM); - return av_samples_fill_arrays((uint8_t **)s->decoded, NULL, + ret = av_samples_fill_arrays((uint8_t **)s->decoded, NULL, s->decoded_buffer, s->channels, s->max_blocksize, AV_SAMPLE_FMT_S32P, 0); + return ret < 0 ? ret : 0; } /** _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
