Merge commit 'f07a4290'

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

Merge commit 'f07a4290'
* commit 'f07a4290': x11grab: K&R formatting cosmetics Conflicts: libavdevice/x11grab.c Merged-by: N Michael Niedermayer <michaelni@gmx.at>
5393c9da · Michael Niedermayer · 0ddb0516 · f07a4290 · 5393c9da
展开全部隐藏空白更改
内联并排

Showing with 139 addition and 134 deletion

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

未找到文件。
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c