Merge commit '58396e80'
* commit '58396e80': x11grab: Use a typedef for the context, as most other code does Conflicts: libavdevice/x11grab.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '58396e80': x11grab: Use a typedef for the context, as most other code does Conflicts: libavdevice/x11grab.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>