diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 20:42:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 20:42:52 +0100 |
| commit | 3171ac209b04726496a3eaa296629d40f25c2af8 (patch) | |
| tree | ceea499b2fc7bbe85ad271d399b304cc80939e52 /libavutil/utils.c | |
| parent | 7d56aab2de7725bbf6fd378d1652ef531a782d72 (diff) | |
| parent | d40815a982c36ff9da09ae3edb5e3bd7d97b5d42 (diff) | |
| download | ffmpeg-3171ac209b04726496a3eaa296629d40f25c2af8.tar.gz | |
Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'
* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
xcbgrab: Correctly make shm optional
Conflicts:
libavdevice/xcbgrab.c
See: 8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/utils.c')
0 files changed, 0 insertions, 0 deletions