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

Merge commit '64bb3fa6' 


* commit '64bb3fa6':
  cavs: cosmetics, reformat top part
  cavsdec: cosmetics, reformat
  libavcodec/utils: Add braces to shut up gcc warnings

Conflicts:
	libavcodec/cavsdec.c
	libavcodec/utils.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 87350d6b 64bb3fa6
No related branches found
No related tags found
No related merge requests found
Expand all 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