[FFmpeg-cvslog] Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar  4 22:17:51 2014 +0100| [309171bea9cd7f1213cd7ed178e5c7a032ab9a4b] | committer: Michael Niedermayer

Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'

* commit '3407172b36a93cec410c6a287dbeec0f41257512':
  avienc: K&R formatting cosmetics

Conflicts:
	libavformat/avienc.c

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

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