Merge commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:30:18 +0000 (19:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:30:44 +0000 (19:30 +0200)
commite3c3f277a9db88ad00ed94c6f6b0cf837bdd8cb0
tree5c1f76fe07678c321c9ca85acdf5c3dcad68d6ef
parentebb21887b853ffd2ae6eedddef39e13c91bc7956
parentc2c5be57494e6117086771bca34c8cd4c72c8e99
Merge commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/h264_qpel.c