[FFmpeg-cvslog] Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  2 21:57:46 2014 +0200| [4c731233338d2bc6d9646808b7599224450932c6] | committer: Michael Niedermayer

Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67'

* commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67':
  asv: K&R formatting cosmetics

Conflicts:
	libavcodec/asvdec.c
	libavcodec/asvenc.c

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

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