summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-12-06 23:42:36 +0200
committerMartin Storsjö <martin@martin.st>2012-12-07 14:28:47 +0200
commit2c9639227766fea9a8109f82378b312a8d32a1ee (patch)
treee69cc4e24fa69c2149537026bbe6b84e23b59ca1
parenta394959bbee9e41ff121488f251f85e8a8fb3384 (diff)
downloadffmpeg-streaming-2c9639227766fea9a8109f82378b312a8d32a1ee.zip
ffmpeg-streaming-2c9639227766fea9a8109f82378b312a8d32a1ee.tar.gz
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@martin.st>
-rw-r--r--libavcodec/avpicture.c2
1 files changed, 2 insertions, 0 deletions
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)
OpenPOWER on IntegriCloud