[FFmpeg-cvslog] Merge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 00:37:28 2014 +0100| [16f619f57c07f518d4d9fa8de3f23540174ff8ef] | committer: Michael Niedermayer

Merge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150'

* commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150':
  dsputil: Merge variable declarations and initializations

Conflicts:
	libavcodec/dsputil_template.c

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

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