Changeset 3171ac20 in ffmpeg
- Timestamp:
- Feb 15, 2015, 7:42:52 PM (10 years ago)
- Branches:
- master
- Children:
- 3773b6ed
- Parents:
- 7d56aab2 (diff), d40815a9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - git-author:
- Michael Niedermayer <michaelni@gmx.at> (02/15/15 19:42:13)
- git-committer:
- Michael Niedermayer <michaelni@gmx.at> (02/15/15 19:42:52)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libavdevice/xcbgrab.c
r7d56aab2 r3171ac20 55 55 xcb_shm_seg_t segment; 56 56 #endif 57 58 57 int64_t time_frame; 59 58 AVRational time_base; … … 630 629 } 631 630 632 #if CONFIG_LIBXCB_SHM633 c->segment = xcb_generate_id(c->conn);634 #endif635 636 631 ret = create_stream(s); 637 632 … … 642 637 643 638 #if CONFIG_LIBXCB_SHM 644 c->has_shm = check_shm(c->conn); 639 if ((c->has_shm = check_shm(c->conn))) 640 c->segment = xcb_generate_id(c->conn); 645 641 #endif 646 642
Note:
See TracChangeset
for help on using the changeset viewer.