Commit d7812209 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '10aa44aa'

* commit '10aa44aa':
  avidec: K&R formatting cosmetics

Conflicts:
	libavformat/avidec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1ecf3802 10aa44aa
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