From 2c9639227766fea9a8109f82378b312a8d32a1ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 6 Dec 2012 23:42:36 +0200 Subject: avpicture: Don't assume a valid pix fmt in avpicture_get_size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When called from the v4l2 input device, pix_fmt can be AV_PIX_FMT_NONE (for jpeg formats). Before 50ba57e0, this wasn't an issue for avpicture_get_size, but after that commit, this lead to crashes. Signed-off-by: Martin Storsjö --- libavcodec/avpicture.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/avpicture.c b/libavcodec/avpicture.c index ec4e748..259fd8e 100644 --- a/libavcodec/avpicture.c +++ b/libavcodec/avpicture.c @@ -88,6 +88,8 @@ int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height) AVPicture dummy_pict; int ret; + if (!desc) + return AVERROR(EINVAL); if ((ret = av_image_check_size(width, height, 0, NULL)) < 0) return ret; if (desc->flags & PIX_FMT_PSEUDOPAL) -- cgit v1.1