diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:30:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:30:44 +0200 |
| commit | e3c3f277a9db88ad00ed94c6f6b0cf837bdd8cb0 (patch) | |
| tree | 5c1f76fe07678c321c9ca85acdf5c3dcad68d6ef /libavcodec/x86/h264_qpel.c | |
| parent | ebb21887b853ffd2ae6eedddef39e13c91bc7956 (diff) | |
| parent | c2c5be57494e6117086771bca34c8cd4c72c8e99 (diff) | |
| download | ffmpeg-e3c3f277a9db88ad00ed94c6f6b0cf837bdd8cb0.tar.gz | |
Merge commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99'
* commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99':
x86: h264_qpel: Simplify an #if conditional
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_qpel.c')
| -rw-r--r-- | libavcodec/x86/h264_qpel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 56affe28d1..8edaeacde6 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -497,7 +497,7 @@ QPEL16_OP(mc31, MMX)\ QPEL16_OP(mc32, MMX)\ QPEL16_OP(mc33, MMX) -#if ARCH_X86_32 && HAVE_YASM && CONFIG_H264QPEL // ARCH_X86_64 implies SSE2+ +#if ARCH_X86_32 // ARCH_X86_64 implies SSE2+ QPEL16(mmxext) #endif |