diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-11-25 23:38:43 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-02-15 18:20:54 +0100 |
| commit | d40815a982c36ff9da09ae3edb5e3bd7d97b5d42 (patch) | |
| tree | af84ab136bb8d0748eda41f40a1f75e9c6c0022e /libavdevice | |
| parent | c23ccaf98827cffa651cec3bfa5e57457dfc9dff (diff) | |
| download | ffmpeg-d40815a982c36ff9da09ae3edb5e3bd7d97b5d42.tar.gz | |
xcbgrab: Correctly make shm optional
The segment field in the struct has to be conditionally build
as well.
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/xcbgrab.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index 161bd03281..23969c9752 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -47,8 +47,9 @@ typedef struct XCBGrabContext { xcb_connection_t *conn; xcb_screen_t *screen; xcb_window_t window; +#if CONFIG_LIBXCB_SHM xcb_shm_seg_t segment; - +#endif int64_t time_frame; AVRational time_base; @@ -614,8 +615,6 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s) return AVERROR(EIO); } - c->segment = xcb_generate_id(c->conn); - ret = create_stream(s); if (ret < 0) { @@ -624,7 +623,8 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s) } #if CONFIG_LIBXCB_SHM - c->has_shm = check_shm(c->conn); + if ((c->has_shm = check_shm(c->conn))) + c->segment = xcb_generate_id(c->conn); #endif #if CONFIG_LIBXCB_XFIXES |