RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42' 

* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
  xcbgrab: Correctly make shm optional

Conflicts:
	libavdevice/xcbgrab.c

See: 8c0ae9015a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-15 20:42:13 +01:00
parent 7d56aab2de d40815a982
commit 3171ac209b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavdevice/xcbgrab.c
View File

@ -54,7 +54,6 @@ typedef struct XCBGrabContext {
#if CONFIG_LIBXCB_SHM
xcb_shm_seg_t segment;
#endif
int64_t time_frame;
AVRational time_base;
@ -629,10 +628,6 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
return AVERROR(EIO);
}
#if CONFIG_LIBXCB_SHM
c->segment = xcb_generate_id(c->conn);
#endif
ret = create_stream(s);
if (ret < 0) {
@ -641,7 +636,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