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

Merge commit '6d8629aa' 


* commit '6d8629aa':
  aac: K&R formatting cosmetics

Conflicts:
	libavcodec/aacdec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ef906390 6d8629aa
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 173 additions and 95 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment