Skip to content

F
ffmpeg.wasm-core
Commit 6860b408 authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

x86: include x86inc.asm in x86util.asm 

This is necessary to allow refactoring some x86util macros with cpuflags.
parent ab9545a2
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 36 deletions
libavcodec/x86/ac3dsp.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/dct32.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA 32 SECTION_RODATA 32
......
libavcodec/x86/deinterlace.asm
View file @ 6860b408
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/dsputil.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/dsputilenc.asm
View file @ 6860b408
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;***************************************************************************** ;*****************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION .text SECTION .text
......
libavcodec/x86/fft.asm
View file @ 6860b408
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
; in blocks as conventient to the vector size. ; in blocks as conventient to the vector size.
; i.e. {4x real, 4x imaginary, 4x real, ...} (or 2x respectively) ; i.e. {4x real, 4x imaginary, 4x real, ...} (or 2x respectively)
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
%if ARCH_X86_64 %if ARCH_X86_64
......
libavcodec/x86/fmtconvert.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_TEXT SECTION_TEXT
......
libavcodec/x86/h264_chromamc.asm
View file @ 6860b408
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/h264_chromamc_10bit.asm
View file @ 6860b408
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/h264_deblock.asm
View file @ 6860b408
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/h264_deblock_10bit.asm
View file @ 6860b408
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/h264_idct.asm
View file @ 6860b408
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;***************************************************************************** ;*****************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/h264_idct_10bit.asm
View file @ 6860b408
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/h264_intrapred.asm
View file @ 6860b408
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/h264_intrapred_10bit.asm
View file @ 6860b408
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/h264_qpel_10bit.asm
View file @ 6860b408
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA 32 SECTION_RODATA 32
......
libavcodec/x86/h264_weight.asm
View file @ 6860b408
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86util.asm"
SECTION .text SECTION .text
......
libavcodec/x86/h264_weight_10bit.asm
View file @ 6860b408
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA 32 SECTION_RODATA 32
......
libavcodec/x86/imdct36.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "libavutil/x86/x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/pngdsp.asm
View file @ 6860b408
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/proresdsp.asm
View file @ 6860b408
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
%define W1sh2 22725 ; W1 = 90901 = 22725<<2 + 1 %define W1sh2 22725 ; W1 = 90901 = 22725<<2 + 1
......
libavcodec/x86/rv34dsp.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/rv40dsp.asm
View file @ 6860b408
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavcodec/x86/sbrdsp.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
;SECTION_RODATA ;SECTION_RODATA
......
libavcodec/x86/vc1dsp.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
cextern pw_4 cextern pw_4
......
libavcodec/x86/vp3dsp.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
; MMX-optimized functions cribbed from the original VP3 source code. ; MMX-optimized functions cribbed from the original VP3 source code.
......
libavcodec/x86/vp56dsp.asm
View file @ 6860b408
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
cextern pw_64 cextern pw_64
......
libavcodec/x86/vp8dsp.asm
View file @ 6860b408
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libavfilter/x86/hqdn3d.asm
View file @ 6860b408
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86util.asm"
SECTION .text SECTION .text
......
libavresample/x86/audio_convert.asm
View file @ 6860b408
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
%include "util.asm" %include "util.asm"
......
libavresample/x86/audio_mix.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
%include "util.asm" %include "util.asm"
......
libavutil/x86/cpuid.asm
View file @ 6860b408
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86util.asm"
SECTION .text SECTION .text
......
libavutil/x86/float_dsp.asm
View file @ 6860b408
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION .text SECTION .text
......
libavutil/x86/x86util.asm
View file @ 6860b408
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%macro SBUTTERFLY 4 %macro SBUTTERFLY 4
%if avx_enabled == 0 %if avx_enabled == 0
mova m%4, m%2 mova m%4, m%2
......
libswscale/x86/input.asm
View file @ 6860b408
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libswscale/x86/output.asm
View file @ 6860b408
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
libswscale/x86/scale.asm
View file @ 6860b408
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm"
%include "x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment