[FFmpeg-cvslog] avcodec/utils: Check the return code of av_image_fill_linesizes()

Michael Niedermayer git at videolan.org
Wed Feb 3 16:19:57 CET 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Feb  3 15:50:17 2016 +0100| [edc34c937b703d6eb29a3f63691aeb6637dd4aa4] | committer: Michael Niedermayer

avcodec/utils: Check the return code of av_image_fill_linesizes()

Fixes CID1271741

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c103039..0f28fec 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -521,7 +521,9 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame)
         do {
             // NOTE: do not align linesizes individually, this breaks e.g. assumptions
             // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
-            av_image_fill_linesizes(linesize, avctx->pix_fmt, w);
+            ret = av_image_fill_linesizes(linesize, avctx->pix_fmt, w);
+            if (ret < 0)
+                return ret;
             // increase alignment of w for next try (rhs gives the lowest bit set in w)
             w += w & ~(w - 1);
 



More information about the ffmpeg-cvslog mailing list