[FFmpeg-cvslog] Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 24 02:08:14 2014 +0200| [8b59ab1af0ddfe933bfa6b97745b15748c678b4c] | committer: Michael Niedermayer

Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'

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

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b59ab1af0ddfe933bfa6b97745b15748c678b4c
---