Merge commit 'f07a4290'

* commit 'f07a4290': x11grab: K&R formatting cosmetics Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f07a4290'
* commit 'f07a4290': x11grab: K&R formatting cosmetics Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
5393c9da · Michael Niedermayer · 0ddb0516 · f07a4290 · 5393c9da
Commit 5393c9da authored Aug 28, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 139 additions and 134 deletions

x11grab.c libavdevice/x11grab.c +139 -134

No files found.
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c