Merge commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Oct 2014 01:22:55 +0000 (03:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Oct 2014 01:22:55 +0000 (03:22 +0200)
commit8e5be0fffe9fee1916bb62bc343f56eb4b6af020
tree3fe1a4bd38da38dfed96244bd321832cae35a13b
parent98baa8151a50777c327d88a500eb9048332866bb
parent5b9c817dc7577b6d44acc94d73b9c77c52cda489
Merge commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489'

* 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>
libavdevice/x11grab.c