Merge commit '9e06327e'

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

Conflicts:
	libavdevice/xcbgrab.c

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

libavdevice/xcbgrab.c

@@ -106,14 +106,13 @@ static int xcbgrab_reposition(AVFormatContext *s,
                               xcb_get_geometry_reply_t *geo)
 {
     XCBGrabContext *c = s->priv_data;
-    int x, y, p_x, p_y;
+    int x = c->x, y = c->y;
     int w = c->width, h = c->height, f = c->follow_mouse;
+    int p_x, p_y;
 
     if (!p || !geo)
         return AVERROR(EIO);
 
-    x = c->x;
-    y = c->y;
     p_x = p->win_x;
     p_y = p->win_y;