Merge commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-05 19:30:18 +02:00
commit e3c3f277a9