diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 05:13:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 05:14:38 +0100 |
| commit | c054cff87a3329a1e55abc9cd2659f790f09678e (patch) | |
| tree | ecdb205fb493ab58ede85c5614e7b70193902cf7 /libavdevice/xcbgrab.c | |
| parent | d05b154b5b6d91ac625409542977a5c8a9a08a37 (diff) | |
| parent | 9e06327ecb8f73c7904d10af7ad339c57cdaa788 (diff) | |
| download | ffmpeg-c054cff87a3329a1e55abc9cd2659f790f09678e.tar.gz | |
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>
Diffstat (limited to 'libavdevice/xcbgrab.c')
| -rw-r--r-- | libavdevice/xcbgrab.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index c3cc8484cc..e26448ccfb 100644 --- a/libavdevice/xcbgrab.c +++ b/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; |