Commit 4f63d6d3 authored by Michael Niedermayer's avatar Michael Niedermayer

avdevice/x11grab: fix error handling in pixel formats

Reviewed-by: 's avatarBenoit Fouet <benoit.fouet@free.fr>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent bb8b7525
...@@ -181,6 +181,8 @@ static int pixfmt_from_image(AVFormatContext *s, XImage *image, int *pix_fmt) ...@@ -181,6 +181,8 @@ static int pixfmt_from_image(AVFormatContext *s, XImage *image, int *pix_fmt)
image->blue_mask, image->blue_mask,
image->bits_per_pixel); image->bits_per_pixel);
*pix_fmt = AV_PIX_FMT_NONE;
switch (image->bits_per_pixel) { switch (image->bits_per_pixel) {
case 8: case 8:
*pix_fmt = AV_PIX_FMT_PAL8; *pix_fmt = AV_PIX_FMT_PAL8;
...@@ -214,7 +216,8 @@ static int pixfmt_from_image(AVFormatContext *s, XImage *image, int *pix_fmt) ...@@ -214,7 +216,8 @@ static int pixfmt_from_image(AVFormatContext *s, XImage *image, int *pix_fmt)
*pix_fmt = AV_PIX_FMT_0RGB32; *pix_fmt = AV_PIX_FMT_0RGB32;
} }
break; break;
default: }
if (*pix_fmt == AV_PIX_FMT_NONE) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"XImages with RGB mask 0x%.6lx 0x%.6lx 0x%.6lx and depth %i " "XImages with RGB mask 0x%.6lx 0x%.6lx 0x%.6lx and depth %i "
"are currently not supported.\n", "are currently not supported.\n",
......
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