har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NASM include directive

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Dave Yeo 2011-08-14 11:46:18 -07:00 committed by Ronald S. Bultje
parent 48f7163f13
commit cc73511e8e
23 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -26,7 +26,7 @@ IFLAGS := -I. -I$(SRC_PATH)
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
CFLAGS += $(ECFLAGS)
CCFLAGS = $(CFLAGS)
YASMFLAGS += $(IFLAGS) -Pconfig.asm
YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
HOSTCFLAGS += $(IFLAGS)
LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)

4
libavcodec/x86/ac3dsp.asm
View File

@ -19,8 +19,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA

4
libavcodec/x86/dct32_sse.asm
View File

@ -19,8 +19,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA 32

4
libavcodec/x86/deinterlace.asm
View File

@ -20,8 +20,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA

2
libavcodec/x86/dsputil_yasm.asm
View File

@ -19,7 +19,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "x86inc.asm"
SECTION_RODATA
pb_f: times 16 db 15

4
libavcodec/x86/dsputilenc_yasm.asm
View File

@ -21,8 +21,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;*****************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION .text

2
libavcodec/x86/fft_mmx.asm
View File

@ -28,7 +28,7 @@
; in blocks as conventient to the vector size.
; i.e. {4x real, 4x imaginary, 4x real, ...} (or 2x respectively)
%include "libavutil/x86/x86inc.asm"
%include "x86inc.asm"
%ifdef ARCH_X86_64
%define pointer resq

4
libavcodec/x86/fmtconvert.asm
View File

@ -19,8 +19,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_TEXT

4
libavcodec/x86/h264_chromamc.asm
View File

@ -20,8 +20,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA

4
libavcodec/x86/h264_chromamc_10bit.asm
View File

@ -22,8 +22,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA

4
libavcodec/x86/h264_deblock.asm
View File

@ -24,8 +24,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION .text

4
libavcodec/x86/h264_deblock_10bit.asm
View File

@ -24,8 +24,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA

4
libavcodec/x86/h264_idct.asm
View File

@ -26,8 +26,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;*****************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA

4
libavcodec/x86/h264_idct_10bit.asm
View File

@ -22,8 +22,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA

4
libavcodec/x86/h264_intrapred.asm
View File

@ -22,8 +22,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA

4
libavcodec/x86/h264_intrapred_10bit.asm
View File

@ -22,8 +22,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA

4
libavcodec/x86/h264_qpel_10bit.asm
View File

@ -22,8 +22,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA 32

2
libavcodec/x86/h264_weight.asm
View File

@ -21,7 +21,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "x86inc.asm"
SECTION .text

4
libavcodec/x86/h264_weight_10bit.asm
View File

@ -22,8 +22,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA 32

4
libavcodec/x86/vc1dsp_yasm.asm
View File

@ -19,8 +19,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
cextern pw_4
cextern pw_5

4
libavcodec/x86/vp3dsp.asm
View File

@ -19,8 +19,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
; MMX-optimized functions cribbed from the original VP3 source code.

4
libavcodec/x86/vp56dsp.asm
View File

@ -20,8 +20,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
cextern pw_64

4
libavcodec/x86/vp8dsp.asm
View File

@ -20,8 +20,8 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "libavutil/x86/x86inc.asm"
%include "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"
SECTION_RODATA