1. ffmpeg
  2. Commit cc73511e8e81b2e1454f406acb71da9fd1c60d32
Browse code

Fix NASM include directive

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

Dave Yeo authored on 2011/08/15 03:46:18
Showing 23 changed files
Makefile
History View file @ cc73511
... ... 
@@ -26,7 +26,7 @@ IFLAGS     := -I. -I$(SRC_PATH)
26 26 
 CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)
27 27 
 CFLAGS     += $(ECFLAGS)
28 28 
 CCFLAGS     = $(CFLAGS)
29 
-YASMFLAGS  += $(IFLAGS) -Pconfig.asm
29 
+YASMFLAGS  += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
30 30 
 HOSTCFLAGS += $(IFLAGS)
31 31 
 LDFLAGS    := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
32 32
libavcodec/x86/ac3dsp.asm
History View file @ cc73511
... ... 
@@ -19,8 +19,8 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "libavutil/x86/x86inc.asm"
23 
-%include "libavutil/x86/x86util.asm"
22 
+%include "x86inc.asm"
23 
+%include "x86util.asm"
24 24
25 25 
 SECTION_RODATA
26 26
libavcodec/x86/dct32_sse.asm
History View file @ cc73511
... ... 
@@ -19,8 +19,8 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "libavutil/x86/x86inc.asm"
23 
-%include "libavutil/x86/x86util.asm"
22 
+%include "x86inc.asm"
23 
+%include "x86util.asm"
24 24
25 25 
 SECTION_RODATA 32
26 26
libavcodec/x86/deinterlace.asm
History View file @ cc73511
... ... 
@@ -20,8 +20,8 @@
20 20 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 
 ;******************************************************************************
22 22
23 
-%include "libavutil/x86/x86inc.asm"
24 
-%include "libavutil/x86/x86util.asm"
23 
+%include "x86inc.asm"
24 
+%include "x86util.asm"
25 25
26 26 
 SECTION_RODATA
27 27
libavcodec/x86/dsputil_yasm.asm
History View file @ cc73511
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "libavutil/x86/x86inc.asm"
22 
+%include "x86inc.asm"
23 23
24 24 
 SECTION_RODATA
25 25 
 pb_f: times 16 db 15
libavcodec/x86/dsputilenc_yasm.asm
History View file @ cc73511
... ... 
@@ -21,8 +21,8 @@
21 21 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22 
 ;*****************************************************************************
23 23
24 
-%include "libavutil/x86/x86inc.asm"
25 
-%include "libavutil/x86/x86util.asm"
24 
+%include "x86inc.asm"
25 
+%include "x86util.asm"
26 26
27 27 
 SECTION .text
28 28
libavcodec/x86/fft_mmx.asm
History View file @ cc73511
... ... 
@@ -28,7 +28,7 @@
28 28 
 ; in blocks as conventient to the vector size.
29 29 
 ; i.e. {4x real, 4x imaginary, 4x real, ...} (or 2x respectively)
30 30
31 
-%include "libavutil/x86/x86inc.asm"
31 
+%include "x86inc.asm"
32 32
33 33 
 %ifdef ARCH_X86_64
34 34 
 %define pointer resq
libavcodec/x86/fmtconvert.asm
History View file @ cc73511
... ... 
@@ -19,8 +19,8 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "libavutil/x86/x86inc.asm"
23 
-%include "libavutil/x86/x86util.asm"
22 
+%include "x86inc.asm"
23 
+%include "x86util.asm"
24 24
25 25 
 SECTION_TEXT
26 26
libavcodec/x86/h264_chromamc.asm
History View file @ cc73511
... ... 
@@ -20,8 +20,8 @@
20 20 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 
 ;******************************************************************************
22 22
23 
-%include "libavutil/x86/x86inc.asm"
24 
-%include "libavutil/x86/x86util.asm"
23 
+%include "x86inc.asm"
24 
+%include "x86util.asm"
25 25
26 26 
 SECTION_RODATA
27 27
libavcodec/x86/h264_chromamc_10bit.asm
History View file @ cc73511
... ... 
@@ -22,8 +22,8 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "libavutil/x86/x86inc.asm"
26 
-%include "libavutil/x86/x86util.asm"
25 
+%include "x86inc.asm"
26 
+%include "x86util.asm"
27 27
28 28 
 SECTION_RODATA
29 29
libavcodec/x86/h264_deblock.asm
History View file @ cc73511
... ... 
@@ -24,8 +24,8 @@
24 24 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
25 25 
 ;******************************************************************************
26 26
27 
-%include "libavutil/x86/x86inc.asm"
28 
-%include "libavutil/x86/x86util.asm"
27 
+%include "x86inc.asm"
28 
+%include "x86util.asm"
29 29
30 30 
 SECTION .text
31 31
libavcodec/x86/h264_deblock_10bit.asm
History View file @ cc73511
... ... 
@@ -24,8 +24,8 @@
24 24 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
25 25 
 ;******************************************************************************
26 26
27 
-%include "libavutil/x86/x86inc.asm"
28 
-%include "libavutil/x86/x86util.asm"
27 
+%include "x86inc.asm"
28 
+%include "x86util.asm"
29 29
30 30 
 SECTION_RODATA
31 31
libavcodec/x86/h264_idct.asm
History View file @ cc73511
... ... 
@@ -26,8 +26,8 @@
26 26 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
27 27 
 ;*****************************************************************************
28 28
29 
-%include "libavutil/x86/x86inc.asm"
30 
-%include "libavutil/x86/x86util.asm"
29 
+%include "x86inc.asm"
30 
+%include "x86util.asm"
31 31
32 32 
 SECTION_RODATA
33 33
libavcodec/x86/h264_idct_10bit.asm
History View file @ cc73511
... ... 
@@ -22,8 +22,8 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "libavutil/x86/x86inc.asm"
26 
-%include "libavutil/x86/x86util.asm"
25 
+%include "x86inc.asm"
26 
+%include "x86util.asm"
27 27
28 28 
 SECTION_RODATA
29 29
libavcodec/x86/h264_intrapred.asm
History View file @ cc73511
... ... 
@@ -22,8 +22,8 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "libavutil/x86/x86inc.asm"
26 
-%include "libavutil/x86/x86util.asm"
25 
+%include "x86inc.asm"
26 
+%include "x86util.asm"
27 27
28 28 
 SECTION_RODATA
29 29
libavcodec/x86/h264_intrapred_10bit.asm
History View file @ cc73511
... ... 
@@ -22,8 +22,8 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "libavutil/x86/x86inc.asm"
26 
-%include "libavutil/x86/x86util.asm"
25 
+%include "x86inc.asm"
26 
+%include "x86util.asm"
27 27
28 28 
 SECTION_RODATA
29 29
libavcodec/x86/h264_qpel_10bit.asm
History View file @ cc73511
... ... 
@@ -22,8 +22,8 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "libavutil/x86/x86inc.asm"
26 
-%include "libavutil/x86/x86util.asm"
25 
+%include "x86inc.asm"
26 
+%include "x86util.asm"
27 27
28 28 
 SECTION_RODATA 32
29 29
libavcodec/x86/h264_weight.asm
History View file @ cc73511
... ... 
@@ -21,7 +21,7 @@
21 21 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22 
 ;******************************************************************************
23 23
24 
-%include "libavutil/x86/x86inc.asm"
24 
+%include "x86inc.asm"
25 25
26 26 
 SECTION .text
27 27
libavcodec/x86/h264_weight_10bit.asm
History View file @ cc73511
... ... 
@@ -22,8 +22,8 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "libavutil/x86/x86inc.asm"
26 
-%include "libavutil/x86/x86util.asm"
25 
+%include "x86inc.asm"
26 
+%include "x86util.asm"
27 27
28 28 
 SECTION_RODATA 32
29 29
libavcodec/x86/vc1dsp_yasm.asm
History View file @ cc73511
... ... 
@@ -19,8 +19,8 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "libavutil/x86/x86inc.asm"
23 
-%include "libavutil/x86/x86util.asm"
22 
+%include "x86inc.asm"
23 
+%include "x86util.asm"
24 24
25 25 
 cextern pw_4
26 26 
 cextern pw_5
libavcodec/x86/vp3dsp.asm
History View file @ cc73511
... ... 
@@ -19,8 +19,8 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "libavutil/x86/x86inc.asm"
23 
-%include "libavutil/x86/x86util.asm"
22 
+%include "x86inc.asm"
23 
+%include "x86util.asm"
24 24
25 25 
 ; MMX-optimized functions cribbed from the original VP3 source code.
26 26
libavcodec/x86/vp56dsp.asm
History View file @ cc73511
... ... 
@@ -20,8 +20,8 @@
20 20 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 
 ;******************************************************************************
22 22
23 
-%include "libavutil/x86/x86inc.asm"
24 
-%include "libavutil/x86/x86util.asm"
23 
+%include "x86inc.asm"
24 
+%include "x86util.asm"
25 25
26 26 
 cextern pw_64
27 27
libavcodec/x86/vp8dsp.asm
History View file @ cc73511
... ... 
@@ -20,8 +20,8 @@
20 20 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 
 ;******************************************************************************
22 22
23 
-%include "libavutil/x86/x86inc.asm"
24 
-%include "libavutil/x86/x86util.asm"
23 
+%include "x86inc.asm"
24 
+%include "x86util.asm"
25 25
26 26 
 SECTION_RODATA
27 27