1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Use nested ifs instead of &&, which appears to not work with %ifidn (i.e. this

construct was always enabled, even for <ssse3 versions).

Originally committed as revision 24509 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2010-07-26 13:56:51 +00:00
parent 0b2c75cb68
commit bcd4aa6498

View File

@ -1394,8 +1394,10 @@ cglobal vp8_%2_loop_filter_simple_%1, 3, %3
%if mmsize == 8 ; mmx/mmxext %if mmsize == 8 ; mmx/mmxext
mov r3, 2 mov r3, 2
%endif %endif
%ifnidn %1, sse2 && mmsize == 16 %ifnidn %1, sse2
%if mmsize == 16
pxor m0, m0 pxor m0, m0
%endif
%endif %endif
SPLATB_REG m7, r2, m0 ; splat "flim" into register SPLATB_REG m7, r2, m0 ; splat "flim" into register
@ -1584,9 +1586,11 @@ cglobal vp8_%2_loop_filter16y_inner_%1, 5, %3, %5
%define stack_reg hev_thr_reg %define stack_reg hev_thr_reg
%endif %endif
%ifnidn %1, sse2 && mmsize == 16 %ifnidn %1, sse2
%if mmsize == 16
pxor m7, m7 pxor m7, m7
%endif %endif
%endif
%ifndef m8 ; mmx/mmxext or sse2 on x86-32 %ifndef m8 ; mmx/mmxext or sse2 on x86-32
; splat function arguments ; splat function arguments
@ -2181,9 +2185,11 @@ cglobal vp8_%2_loop_filter16y_mbedge_%1, 5, %3, %5
%define stack_reg hev_thr_reg %define stack_reg hev_thr_reg
%endif %endif
%ifnidn %1, sse2 && mmsize == 16 %ifnidn %1, sse2
%if mmsize == 16
pxor m7, m7 pxor m7, m7
%endif %endif
%endif
%ifndef m8 ; mmx/mmxext or sse2 on x86-32 %ifndef m8 ; mmx/mmxext or sse2 on x86-32
; splat function arguments ; splat function arguments