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

Merge commit '75439bb3' 


* commit '75439bb3':
  siff: K&R formatting cosmetics

Conflicts:
	libavformat/siff.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents b37858ea 75439bb3
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 41 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