[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  2 00:25:21 2014 +0200| [d063bb63cb389648d149bd1d9a886e12ed2e4d47] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  VP3: K&R formatting cosmetics

Conflicts:
	libavcodec/vp3.c

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

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