mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Fix NASM include directive
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
parent
48f7163f13
commit
cc73511e8e
2
Makefile
2
Makefile
@ -26,7 +26,7 @@ IFLAGS := -I. -I$(SRC_PATH)
|
|||||||
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
|
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
|
||||||
CFLAGS += $(ECFLAGS)
|
CFLAGS += $(ECFLAGS)
|
||||||
CCFLAGS = $(CFLAGS)
|
CCFLAGS = $(CFLAGS)
|
||||||
YASMFLAGS += $(IFLAGS) -Pconfig.asm
|
YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
|
||||||
HOSTCFLAGS += $(IFLAGS)
|
HOSTCFLAGS += $(IFLAGS)
|
||||||
LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
|
LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
|
||||||
|
|
||||||
|
@ -19,8 +19,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
|
|
||||||
|
@ -19,8 +19,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA 32
|
SECTION_RODATA 32
|
||||||
|
|
||||||
|
@ -20,8 +20,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
|
|
||||||
|
@ -19,7 +19,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
pb_f: times 16 db 15
|
pb_f: times 16 db 15
|
||||||
|
@ -21,8 +21,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION .text
|
SECTION .text
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
; 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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
|
|
||||||
%ifdef ARCH_X86_64
|
%ifdef ARCH_X86_64
|
||||||
%define pointer resq
|
%define pointer resq
|
||||||
|
@ -19,8 +19,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_TEXT
|
SECTION_TEXT
|
||||||
|
|
||||||
|
@ -20,8 +20,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
|
|
||||||
|
@ -22,8 +22,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
|
|
||||||
|
@ -24,8 +24,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION .text
|
SECTION .text
|
||||||
|
|
||||||
|
@ -24,8 +24,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
|
|
||||||
|
@ -26,8 +26,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
|
|
||||||
|
@ -22,8 +22,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
|
|
||||||
|
@ -22,8 +22,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
|
|
||||||
|
@ -22,8 +22,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
|
|
||||||
|
@ -22,8 +22,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA 32
|
SECTION_RODATA 32
|
||||||
|
|
||||||
|
@ -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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
|
|
||||||
SECTION .text
|
SECTION .text
|
||||||
|
|
||||||
|
@ -22,8 +22,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA 32
|
SECTION_RODATA 32
|
||||||
|
|
||||||
|
@ -19,8 +19,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
cextern pw_4
|
cextern pw_4
|
||||||
cextern pw_5
|
cextern pw_5
|
||||||
|
@ -19,8 +19,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/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.
|
||||||
|
|
||||||
|
@ -20,8 +20,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
cextern pw_64
|
cextern pw_64
|
||||||
|
|
||||||
|
@ -20,8 +20,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 "libavutil/x86/x86inc.asm"
|
%include "x86inc.asm"
|
||||||
%include "libavutil/x86/x86util.asm"
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user