[FFmpeg-cvslog] Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 11:06:27 2013 +0200| [482c1ac849faa783a1694222837c9c9cb619237f] | committer: Michael Niedermayer

Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'

* commit '13f57a4d881ec669b87bf82f424bfff502433060':
  wav: K&R formatting cosmetics

Conflicts:
	libavformat/wavdec.c

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

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