Commit 8b59ab1a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'ce2e858f'

* commit 'ce2e858f':
  http: K&R formatting cosmetics

Conflicts:
	libavformat/http.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ab0f78ea ce2e858f
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