[FFmpeg-cvslog] Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 14:32:12 2014 +0100| [152c8fd856e505119c0a2040a9525715fc255c9a] | committer: Michael Niedermayer

Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f'

* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f':
  dsputil: Move hpel_template #include out of dsputil_template

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

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