xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-01-22 03:46:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489'

Browse Source 
* commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489':
  x11grab: Check XFixesGetCursorImage return value

Conflicts:
	libavdevice/x11grab.c

See: a65c0a3fe822386be30fd3371af9f0d008b02874

The warning with adjusted text is kept from a65c0a3fe822386be30fd3371af9f0d008b02874
but drawing the cursor is not disabled in case XFixesGetCursorImage() fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-05 03:22:55 +02:00
commit 8e5be0fffe
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavdevice/x11grab.c
View File

@ -431,8 +431,7 @@ static void paint_mouse_pointer(XImage *image, AVFormatContext *s1)
xcim = XFixesGetCursorImage(dpy);
if (!xcim) {
av_log(s1, AV_LOG_WARNING,
"XFixes extension not available, impossible to draw cursor\n");
s->draw_mouse = 0;
"XFixesGetCursorImage failed\n");
return;
}