[FFmpeg-cvslog] avpicture: Don't assume a valid pix fmt in avpicture_get_size

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Dec  6 23:42:36 2012 +0200| [2c9639227766fea9a8109f82378b312a8d32a1ee] | committer: Martin Storsjö

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: Martin Storsjö <martin at martin.st>

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

 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)