Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 19:39:19 +0000 (21:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 19:39:19 +0000 (21:39 +0200)
commit65c9e2d0030d76c055461e25e22b9e8fa641560d
tree62c7ffc97ac9ae9b8db1d7344a14f08a32e9af95
parent5393c9dadd23f33ca5e22a904131fccffb7ec070
parent20e82b41fcad23ebbb18d89948aebfcc53921198
Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'

* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
  x11grab: Small near-cosmetic refactorings

Conflicts:
libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/x11grab.c