Skip to content
Snippets Groups Projects
Commit 65c9e2d0 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '20e82b41' 


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

Conflicts:
	libavdevice/x11grab.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5393c9da 20e82b41
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 17 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment