[FFmpeg-cvslog] Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 26 10:30:47 2013 +0200| [e28fabb4cbe5e7c6cde8a63733d7530f283a0acb] | committer: Michael Niedermayer

Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'

* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
  twinvq: K&R formatting cosmetics

Conflicts:
	libavcodec/twinvq.c

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

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