Browse Source

xcbgrab: Correctly make shm optional

The segment field in the struct has to be conditionally build
as well.
tags/n2.6
Luca Barbato 11 years ago
parent
commit
d40815a982
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      libavdevice/xcbgrab.c

+ 4
- 4
libavdevice/xcbgrab.c View File

@@ -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


Loading…
Cancel
Save