Commit 2c963922 authored by Martin Storsjö's avatar Martin Storsjö
Browse files

avpicture: Don't assume a valid pix fmt in avpicture_get_size

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: default avatarMartin Storsjö <>
parent a394959b
......@@ -88,6 +88,8 @@ int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height)
AVPicture dummy_pict;
int ret;
if (!desc)
if ((ret = av_image_check_size(width, height, 0, NULL)) < 0)
return ret;
if (desc->flags & PIX_FMT_PSEUDOPAL)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment