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

Merge commit '16c22122' 


* commit '16c22122':
  h264: K&R formatting cosmetics

Conflicts:
	libavcodec/h264.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents edab63a4 16c22122
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 155 additions and 144 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