RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent ebb21887b8 c2c5be5749
commit e3c3f277a9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/x86/h264_qpel.c
View File

@ -497,7 +497,7 @@ QPEL16_OP(mc31, MMX)\
QPEL16_OP(mc32, MMX)\ QPEL16_OP(mc32, MMX)\
QPEL16_OP(mc33, 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) QPEL16(mmxext)
#endif #endif