From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 19 Dec 2014 04:13:59 +0000 (+0100)
Subject: Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'
X-Git-Tag: android-x86-6.0-r1~1326
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c054cff87a3329a1e55abc9cd2659f790f09678e;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'

* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788':
  xcbgrab: Move NULL check before pointer dereference

Conflicts:
	libavdevice/xcbgrab.c

See: e86df0206f06b8d1e97e2b60db8f74a398d53127
Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

c054cff87a3329a1e55abc9cd2659f790f09678e