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

Merge commit 'b2e059a1' 


* commit 'b2e059a1':
  pixdesc: K&R formatting cosmetics

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixdesc.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5727d387 b2e059a1
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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