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

Merge commit '65e78a2e' 


* commit '65e78a2e':
  x11grab: Refactor pixel format parsing

Conflicts:
	libavdevice/x11grab.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 33bf66af 65e78a2e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 71 additions and 75 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