Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:13:59 +0000 (05:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:14:38 +0000 (05:14 +0100)
* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788':
  xcbgrab: Move NULL check before pointer dereference

Conflicts:
libavdevice/xcbgrab.c

See: e86df0206f06b8d1e97e2b60db8f74a398d53127
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavdevice/xcbgrab.c

Simple merge