Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Oct 2014 01:35:22 +0000 (03:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Oct 2014 01:42:55 +0000 (03:42 +0200)
commit345160a9cdf27c928c2430101513c5882e6f9fe1
tree6cd256a054f852e8177729c2346fd955413bf34b
parent8e5be0fffe9fee1916bb62bc343f56eb4b6af020
parent2a5ac99e6e06078713f684fee2466c91f677b303
Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303'

* commit '2a5ac99e6e06078713f684fee2466c91f677b303':
  x11grab: Check the XQueryPointer return value

Conflicts:
libavdevice/x11grab.c

See: 69c34a6ac986e31b5286a1d566617ec25b93e6a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/x11grab.c