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

Merge commit '2db953f8' 


* commit '2db953f8':
  h264: K&R formatting cosmetics

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_direct.c
	libavcodec/h264_slice.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents b884599f 2db953f8
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