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

Merge commit '10aa44aa' 


* commit '10aa44aa':
  avidec: K&R formatting cosmetics

Conflicts:
	libavformat/avidec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 1ecf3802 10aa44aa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 564 additions and 466 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