Commit 102397d2 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '16c22122'

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

Conflicts:
	libavcodec/h264.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents edab63a4 16c22122
This diff is collapsed.
Markdown is supported
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