[FFmpeg-cvslog] Merge commit 'f1de93dec302cc860c718e89656f184510b2d239' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 16 03:29:24 2014 +0100| [6776c2c04fe6af2efe0c7f7eb61497d0003984c3] | committer: Michael Niedermayer

Merge commit 'f1de93dec302cc860c718e89656f184510b2d239' into release/2.2

* commit 'f1de93dec302cc860c718e89656f184510b2d239':
  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=6776c2c04fe6af2efe0c7f7eb61497d0003984c3
---