Skip to content
Snippets Groups Projects
Commit d40815a9 authored by Luca Barbato's avatar Luca Barbato
Browse files

xcbgrab: Correctly make shm optional

The segment field in the struct has to be conditionally build
as well.
parent c23ccaf9
No related branches found
No related tags found
No related merge requests found
...@@ -47,8 +47,9 @@ typedef struct XCBGrabContext { ...@@ -47,8 +47,9 @@ typedef struct XCBGrabContext {
xcb_connection_t *conn; xcb_connection_t *conn;
xcb_screen_t *screen; xcb_screen_t *screen;
xcb_window_t window; xcb_window_t window;
#if CONFIG_LIBXCB_SHM
xcb_shm_seg_t segment; xcb_shm_seg_t segment;
#endif
int64_t time_frame; int64_t time_frame;
AVRational time_base; AVRational time_base;
...@@ -614,8 +615,6 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s) ...@@ -614,8 +615,6 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
return AVERROR(EIO); return AVERROR(EIO);
} }
c->segment = xcb_generate_id(c->conn);
ret = create_stream(s); ret = create_stream(s);
if (ret < 0) { if (ret < 0) {
...@@ -624,7 +623,8 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s) ...@@ -624,7 +623,8 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
} }
#if CONFIG_LIBXCB_SHM #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 #endif
#if CONFIG_LIBXCB_XFIXES #if CONFIG_LIBXCB_XFIXES
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment