[FFmpeg-cvslog] Merge commit '2972087e398454122a82a970ed07924185175c6d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 20:50:00 2014 +0100| [8b66b43128eafc5f0abf0c81a5a523a2aedd5996] | committer: Michael Niedermayer

Merge commit '2972087e398454122a82a970ed07924185175c6d'

* commit '2972087e398454122a82a970ed07924185175c6d':
  hpel_template: Drop some unnecessary parentheses

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

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