generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'

Browse Source 
* commit 'd8c772de53d29afb1bada88afa859fce8489c668':
  nutdec: Always return a value from nut_read_timestamp()
  configure: Make warnings from -Wreturn-type fatal errors
  x86: ABS2: port to cpuflags
  vdpau: Remove av_unused attribute from function declaration
  h264: fix ff_generate_sliding_window_mmcos() prototype.

Conflicts:
	configure
	libavformat/nutdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-01-15 15:23:20 +01:00
parent 24d06cb208 d8c772de53
commit cfc40a6aff
8 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavutil/x86/x86util.asm
View File

@@ -187,7 +187,18 @@
%endif
%endmacro
%macro ABS2_MMX 4 ; a, b, tmp0, tmp1
%macro ABS2 4
%if cpuflag(ssse3)
pabsw %1, %1
pabsw %2, %2
%elif cpuflag(mmxext) ; a, b, tmp0, tmp1
pxor %3, %3
pxor %4, %4
psubw %3, %1
psubw %4, %2
pmaxsw %1, %3
pmaxsw %2, %4
%else ; a, b, tmp0, tmp1
pxor %3, %3
pxor %4, %4
pcmpgtw %3, %1
@@ -196,20 +207,7 @@
pxor %2, %4
psubw %1, %3
psubw %2, %4
%endmacro
%macro ABS2_MMXEXT 4 ; a, b, tmp0, tmp1
pxor %3, %3
pxor %4, %4
psubw %3, %1
psubw %4, %2
pmaxsw %1, %3
pmaxsw %2, %4
%endmacro
%macro ABS2_SSSE3 4
pabsw %1, %1
pabsw %2, %2
%endif
%endmacro
%macro ABSB_MMX 2
@@ -252,7 +250,6 @@
ABS2 %3, %4, %5, %6
%endmacro
%define ABS2 ABS2_MMX
%define ABSB ABSB_MMX
%define ABSB2 ABSB2_MMX