[FFmpeg-cvslog] Merge commit '7a2fddb4480121712df560cf619c1c3566cae3ff'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 02:45:34 2014 +0100| [df41cbee85c8aac02646f39a68e2f6b911b73f18] | committer: Michael Niedermayer

Merge commit '7a2fddb4480121712df560cf619c1c3566cae3ff'

* commit '7a2fddb4480121712df560cf619c1c3566cae3ff':
  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=df41cbee85c8aac02646f39a68e2f6b911b73f18
---