Commit 76d7676f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '2539cf1c'

* commit '2539cf1c':
  hpeldsp_template: K&R formatting cosmetics

Conflicts:
	libavcodec/hpeldsp_template.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8b66b431 2539cf1c
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