highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xcbgrab: Correctly make shm optional

Browse Source 
The segment field in the struct has to be conditionally build
as well.
This commit is contained in:
Luca Barbato 2014-11-25 23:38:43 +01:00
parent c23ccaf988
commit d40815a982
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavdevice/xcbgrab.c
View File

@ -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)
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)
} }
#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