virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avdevice/x11grab: fix error handling in pixel formats

Browse Source 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-09-04 04:09:59 +02:00
parent bb8b752553
commit 4f63d6d3b5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavdevice/x11grab.c
View File

@@ -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)
*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",