[FFmpeg-cvslog] Merge commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct  5 03:22:55 2014 +0200| [8e5be0fffe9fee1916bb62bc343f56eb4b6af020] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e5be0fffe9fee1916bb62bc343f56eb4b6af020
---