avpicture: Don't assume a valid pix fmt in avpicture_get_size
authorMartin Storsjö <martin@martin.st>
Thu, 6 Dec 2012 21:42:36 +0000 (23:42 +0200)
committerMartin Storsjö <martin@martin.st>
Fri, 7 Dec 2012 12:28:47 +0000 (14:28 +0200)
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ö <martin@martin.st>
libavcodec/avpicture.c

index ec4e748..259fd8e 100644 (file)
@@ -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)