[FFmpeg-cvslog] Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 26 23:35:38 2014 +0100| [896d6a7736c82a181bf17eb240f37645f6b7fa91] | committer: Michael Niedermayer

Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'

* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
  avformat: utils: K&R formatting cosmetics

Conflicts:
	libavformat/utils.c

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

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