[FFmpeg-cvslog] ansi: check ff_set_dimensions return value

Vittorio Giovara git at videolan.org
Sun Jan 18 03:20:22 CET 2015


ffmpeg | branch: release/2.4 | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Nov 12 11:13:06 2014 +0100| [39e07ac9fcaf3d412f9a33f427072e8ded032d24] | committer: Luca Barbato

ansi: check ff_set_dimensions return value

CC: libav-stable at libav.org
Bug-Id: CID 1135737
(cherry picked from commit 994ab1804b8bf532f44876927b07b51f1f63247f)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

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

 libavcodec/ansi.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c
index 95b5be4..556bfe4 100644
--- a/libavcodec/ansi.c
+++ b/libavcodec/ansi.c
@@ -88,9 +88,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
     s->fg          = DEFAULT_FG_COLOR;
     s->bg          = DEFAULT_BG_COLOR;
 
-    if (!avctx->width || !avctx->height)
-        ff_set_dimensions(avctx, 80 << 3, 25 << 4);
-
+    if (!avctx->width || !avctx->height) {
+        int ret = ff_set_dimensions(avctx, 80 << 3, 25 << 4);
+        if (ret < 0)
+            return ret;
+    }
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list