[FFmpeg-cvslog] Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 20:52:19 2014 +0100| [76d7676fccee4febb8ddb39f53a5b9a643cb2efd] | committer: Michael Niedermayer

Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'

* commit '2539cf1c814190a017cb8986b41aa2f949e37fd9':
  hpeldsp_template: K&R formatting cosmetics

Conflicts:
	libavcodec/hpeldsp_template.c

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

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