1. ffmpeg
  2. Commit 04581c8c77ce779e4e70684ac45302972766be0f
Browse code

x86: yasm: Use complete source path for macro helper %includes

This is more consistent with the way we handle C #includes and
it simplifies the build system.

Diego Biurrun authored on 2012/07/15 18:48:21
Showing 34 changed files
Makefile
History View file @ 04581c8
... ... 
@@ -27,7 +27,7 @@ CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)
27 27 
 CFLAGS     += $(ECFLAGS)
28 28 
 CCFLAGS     = $(CPPFLAGS) $(CFLAGS)
29 29 
 ASFLAGS    := $(CPPFLAGS) $(ASFLAGS)
30 
-YASMFLAGS  += $(IFLAGS:%=%/) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
30 
+YASMFLAGS  += $(IFLAGS:%=%/) -Pconfig.asm
31 31 
 HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
32 32 
 LDFLAGS    := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
33 33
libavcodec/x86/ac3dsp.asm
History View file @ 04581c8
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "x86util.asm"
22 
+%include "libavutil/x86/x86util.asm"
23 23
24 24 
 SECTION_RODATA
25 25
libavcodec/x86/dct32.asm
History View file @ 04581c8
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "x86util.asm"
22 
+%include "libavutil/x86/x86util.asm"
23 23
24 24 
 SECTION_RODATA 32
25 25
libavcodec/x86/deinterlace.asm
History View file @ 04581c8
... ... 
@@ -20,7 +20,7 @@
20 20 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 
 ;******************************************************************************
22 22
23 
-%include "x86util.asm"
23 
+%include "libavutil/x86/x86util.asm"
24 24
25 25 
 SECTION_RODATA
26 26
libavcodec/x86/dsputil.asm
History View file @ 04581c8
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "x86util.asm"
22 
+%include "libavutil/x86/x86util.asm"
23 23
24 24 
 SECTION_RODATA
25 25 
 pb_f: times 16 db 15
libavcodec/x86/dsputilenc.asm
History View file @ 04581c8
... ... 
@@ -21,7 +21,7 @@
21 21 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22 
 ;*****************************************************************************
23 23
24 
-%include "x86util.asm"
24 
+%include "libavutil/x86/x86util.asm"
25 25
26 26 
 SECTION .text
27 27
libavcodec/x86/fft.asm
History View file @ 04581c8
... ... 
@@ -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 "x86util.asm"
31 
+%include "libavutil/x86/x86util.asm"
32 32
33 33 
 %if ARCH_X86_64
34 34 
 %define pointer resq
libavcodec/x86/fmtconvert.asm
History View file @ 04581c8
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "x86util.asm"
22 
+%include "libavutil/x86/x86util.asm"
23 23
24 24 
 SECTION_TEXT
25 25
libavcodec/x86/h264_chromamc.asm
History View file @ 04581c8
... ... 
@@ -20,7 +20,7 @@
20 20 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 
 ;******************************************************************************
22 22
23 
-%include "x86util.asm"
23 
+%include "libavutil/x86/x86util.asm"
24 24
25 25 
 SECTION_RODATA
26 26
libavcodec/x86/h264_chromamc_10bit.asm
History View file @ 04581c8
... ... 
@@ -22,7 +22,7 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "x86util.asm"
25 
+%include "libavutil/x86/x86util.asm"
26 26
27 27 
 SECTION_RODATA
28 28
libavcodec/x86/h264_deblock.asm
History View file @ 04581c8
... ... 
@@ -24,7 +24,7 @@
24 24 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
25 25 
 ;******************************************************************************
26 26
27 
-%include "x86util.asm"
27 
+%include "libavutil/x86/x86util.asm"
28 28
29 29 
 SECTION_RODATA
30 30
libavcodec/x86/h264_deblock_10bit.asm
History View file @ 04581c8
... ... 
@@ -24,7 +24,7 @@
24 24 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
25 25 
 ;******************************************************************************
26 26
27 
-%include "x86util.asm"
27 
+%include "libavutil/x86/x86util.asm"
28 28
29 29 
 SECTION_RODATA
30 30
libavcodec/x86/h264_idct.asm
History View file @ 04581c8
... ... 
@@ -26,7 +26,7 @@
26 26 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
27 27 
 ;*****************************************************************************
28 28
29 
-%include "x86util.asm"
29 
+%include "libavutil/x86/x86util.asm"
30 30
31 31 
 SECTION_RODATA
32 32
libavcodec/x86/h264_idct_10bit.asm
History View file @ 04581c8
... ... 
@@ -22,7 +22,7 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "x86util.asm"
25 
+%include "libavutil/x86/x86util.asm"
26 26
27 27 
 SECTION_RODATA
28 28
libavcodec/x86/h264_intrapred.asm
History View file @ 04581c8
... ... 
@@ -22,7 +22,7 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "x86util.asm"
25 
+%include "libavutil/x86/x86util.asm"
26 26
27 27 
 SECTION_RODATA
28 28
libavcodec/x86/h264_intrapred_10bit.asm
History View file @ 04581c8
... ... 
@@ -22,7 +22,7 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "x86util.asm"
25 
+%include "libavutil/x86/x86util.asm"
26 26
27 27 
 SECTION_RODATA
28 28
libavcodec/x86/h264_qpel_10bit.asm
History View file @ 04581c8
... ... 
@@ -22,7 +22,7 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "x86util.asm"
25 
+%include "libavutil/x86/x86util.asm"
26 26
27 27 
 SECTION_RODATA 32
28 28
libavcodec/x86/h264_weight.asm
History View file @ 04581c8
... ... 
@@ -21,7 +21,7 @@
21 21 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22 
 ;******************************************************************************
23 23
24 
-%include "x86util.asm"
24 
+%include "libavutil/x86/x86util.asm"
25 25
26 26 
 SECTION .text
27 27
libavcodec/x86/h264_weight_10bit.asm
History View file @ 04581c8
... ... 
@@ -22,7 +22,7 @@
22 22 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23 
 ;******************************************************************************
24 24
25 
-%include "x86util.asm"
25 
+%include "libavutil/x86/x86util.asm"
26 26
27 27 
 SECTION_RODATA 32
28 28
libavcodec/x86/pngdsp.asm
History View file @ 04581c8
... ... 
@@ -21,7 +21,7 @@
21 21 
 ;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22 
 ;******************************************************************************
23 23
24 
-%include "x86util.asm"
24 
+%include "libavutil/x86/x86util.asm"
25 25
26 26 
 SECTION_RODATA
27 27
libavcodec/x86/proresdsp.asm
History View file @ 04581c8
... ... 
@@ -21,7 +21,7 @@
21 21 
 ;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22 
 ;******************************************************************************
23 23
24 
-%include "x86util.asm"
24 
+%include "libavutil/x86/x86util.asm"
25 25
26 26 
 %define W1sh2 22725 ; W1 = 90901 = 22725<<2 + 1
27 27 
 %define W2sh2 21407 ; W2 = 85627 = 21407<<2 - 1
libavcodec/x86/rv34dsp.asm
History View file @ 04581c8
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "x86util.asm"
22 
+%include "libavutil/x86/x86util.asm"
23 23
24 24 
 SECTION_RODATA
25 25 
 pw_row_coeffs:  times 4 dw 13
libavcodec/x86/rv40dsp.asm
History View file @ 04581c8
... ... 
@@ -21,7 +21,7 @@
21 21 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22 
 ;******************************************************************************
23 23
24 
-%include "x86util.asm"
24 
+%include "libavutil/x86/x86util.asm"
25 25
26 26 
 SECTION_RODATA
27 27
libavcodec/x86/sbrdsp.asm
History View file @ 04581c8
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "x86util.asm"
22 
+%include "libavutil/x86/x86util.asm"
23 23
24 24 
 ;SECTION_RODATA
25 25 
 SECTION .text
libavcodec/x86/vc1dsp.asm
History View file @ 04581c8
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "x86util.asm"
22 
+%include "libavutil/x86/x86util.asm"
23 23
24 24 
 cextern pw_4
25 25 
 cextern pw_5
libavcodec/x86/vp3dsp.asm
History View file @ 04581c8
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "x86util.asm"
22 
+%include "libavutil/x86/x86util.asm"
23 23
24 24 
 ; MMX-optimized functions cribbed from the original VP3 source code.
25 25
libavcodec/x86/vp56dsp.asm
History View file @ 04581c8
... ... 
@@ -20,7 +20,7 @@
20 20 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 
 ;******************************************************************************
22 22
23 
-%include "x86util.asm"
23 
+%include "libavutil/x86/x86util.asm"
24 24
25 25 
 cextern pw_64
26 26
libavcodec/x86/vp8dsp.asm
History View file @ 04581c8
... ... 
@@ -20,7 +20,7 @@
20 20 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 
 ;******************************************************************************
22 22
23 
-%include "x86util.asm"
23 
+%include "libavutil/x86/x86util.asm"
24 24
25 25 
 SECTION_RODATA
26 26
libavfilter/x86/hqdn3d.asm
History View file @ 04581c8
... ... 
@@ -18,7 +18,7 @@
18 18 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19 
 ;******************************************************************************
20 20
21 
-%include "x86util.asm"
21 
+%include "libavutil/x86/x86util.asm"
22 22
23 23 
 SECTION .text
24 24
libavresample/x86/audio_convert.asm
History View file @ 04581c8
... ... 
@@ -20,7 +20,7 @@
20 20 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 
 ;******************************************************************************
22 22
23 
-%include "x86util.asm"
23 
+%include "libavutil/x86/x86util.asm"
24 24 
 %include "util.asm"
25 25
26 26 
 SECTION_RODATA 32
libavresample/x86/audio_mix.asm
History View file @ 04581c8
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "x86util.asm"
22 
+%include "libavutil/x86/x86util.asm"
23 23 
 %include "util.asm"
24 24
25 25 
 SECTION_TEXT
libswscale/x86/input.asm
History View file @ 04581c8
... ... 
@@ -21,7 +21,7 @@
21 21 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22 
 ;******************************************************************************
23 23
24 
-%include "x86util.asm"
24 
+%include "libavutil/x86/x86util.asm"
25 25
26 26 
 SECTION_RODATA
27 27
libswscale/x86/output.asm
History View file @ 04581c8
... ... 
@@ -20,7 +20,7 @@
20 20 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 
 ;******************************************************************************
22 22
23 
-%include "x86util.asm"
23 
+%include "libavutil/x86/x86util.asm"
24 24
25 25 
 SECTION_RODATA
26 26
libswscale/x86/scale.asm
History View file @ 04581c8
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20 
 ;******************************************************************************
21 21
22 
-%include "x86util.asm"
22 
+%include "libavutil/x86/x86util.asm"
23 23
24 24 
 SECTION_RODATA
25 25