Changeset 3171ac20 in ffmpeg


Ignore:
Timestamp:
Feb 15, 2015, 7:42:52 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
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)
Message:

Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'

Conflicts:

libavdevice/xcbgrab.c

See: 8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0
Merged-by: Michael Niedermayer <michaelni@gmx.at>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libavdevice/xcbgrab.c

    r7d56aab2 r3171ac20  
    5555    xcb_shm_seg_t segment;
    5656#endif
    57 
    5857    int64_t time_frame;
    5958    AVRational time_base;
     
    630629    }
    631630
    632 #if CONFIG_LIBXCB_SHM
    633     c->segment = xcb_generate_id(c->conn);
    634 #endif
    635 
    636631    ret = create_stream(s);
    637632
     
    642637
    643638#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);
    645641#endif
    646642
Note: See TracChangeset for help on using the changeset viewer.