[FFmpeg-cvslog] Merge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 19 10:10:00 2013 +0200| [02788d2ac5dfffd0ce862adea953e73466ee7018] | committer: Michael Niedermayer

Merge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e'

* commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e':
  wavpack: K&R formatting cosmetics

Conflicts:
	libavcodec/wavpack.c

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

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