From 4f63d6d3b5c064fe4671bd2d190ac13e18aee8a6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 4 Sep 2014 04:09:59 +0200 Subject: avdevice/x11grab: fix error handling in pixel formats Reviewed-by: Benoit Fouet Signed-off-by: Michael Niedermayer --- libavdevice/x11grab.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavdevice') diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 120f754b10..e0d1dfacfa 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -181,6 +181,8 @@ static int pixfmt_from_image(AVFormatContext *s, XImage *image, int *pix_fmt) image->blue_mask, image->bits_per_pixel); + *pix_fmt = AV_PIX_FMT_NONE; + switch (image->bits_per_pixel) { case 8: *pix_fmt = AV_PIX_FMT_PAL8; @@ -214,7 +216,8 @@ static int pixfmt_from_image(AVFormatContext *s, XImage *image, int *pix_fmt) *pix_fmt = AV_PIX_FMT_0RGB32; } break; - default: + } + if (*pix_fmt == AV_PIX_FMT_NONE) { av_log(s, AV_LOG_ERROR, "XImages with RGB mask 0x%.6lx 0x%.6lx 0x%.6lx and depth %i " "are currently not supported.\n", -- cgit v1.2.3