[FFmpeg-cvslog] lavc/utils: check return value of avcodec_fill_audio_frame() for < 0

Stefano Sabatini git at videolan.org
Sun Nov 25 20:38:38 CET 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sun Nov 25 19:47:54 2012 +0100| [e55c3857d20ba015e4914c2e80fcab037af0799d] | committer: Stefano Sabatini

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

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e55c3857d20ba015e4914c2e80fcab037af0799d
---

 libavcodec/utils.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 4749d73..6a5c735 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -418,7 +418,7 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
         }
         if ((ret = avcodec_fill_audio_frame(frame, avctx->channels,
                                             avctx->sample_fmt, buf->data[0],
-                                            buf->audio_data_size, 0)))
+                                            buf->audio_data_size, 0)) < 0)
             return ret;
 
         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,
                                             avctx->sample_fmt,
                                             (const uint8_t *)samples,
-                                            samples_size, 1)))
+                                            samples_size, 1)) < 0)
             return ret;
 
         /* fabricate frame pts from sample count.



More information about the ffmpeg-cvslog mailing list