[FFmpeg-cvslog] Merge commit 'c065f4a0c652cc569c927c95148111b3aa2962dc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 04:34:17 2014 +0200| [c1e7fb60d1ea397e4833b71cf50825a0f2a5b61e] | committer: Michael Niedermayer

Merge commit 'c065f4a0c652cc569c927c95148111b3aa2962dc'

* commit 'c065f4a0c652cc569c927c95148111b3aa2962dc':
  huffyuv: K&R formatting cosmetics

Conflicts:
	libavcodec/huffyuvdec.c

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

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