[FFmpeg-cvslog] Merge commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr  5 19:30:18 2014 +0200| [e3c3f277a9db88ad00ed94c6f6b0cf837bdd8cb0] | committer: Michael Niedermayer

Merge commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99'

* commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99':
  x86: h264_qpel: Simplify an #if conditional

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

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