[FFmpeg-cvslog] Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 30 01:39:46 2014 +0100| [ae3313e1548641e3b4a61520e119729a8b61e061] | committer: Michael Niedermayer

Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'

* commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5':
  vp8: K&R formatting cosmetics

Conflicts:
	libavcodec/vp8.c
	libavcodec/vp8.h
	libavcodec/vp8data.h
	libavcodec/vp8dsp.c

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

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