1. ffmpeg
  2. Commit 9766d9c9851577d8162d5f006dffc721902a1409
Browse code

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

* commit '04581c8c77ce779e4e70684ac45302972766be0f':
x86: yasm: Use complete source path for macro helper %includes

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2012/10/31 21:57:09
Showing 17 changed files
common.mak
History View file @ 9766d9c
... ... 
@@ -30,7 +30,7 @@ CFLAGS     += $(ECFLAGS)
30 30 
 CCFLAGS     = $(CPPFLAGS) $(CFLAGS)
31 31 
 ASFLAGS    := $(CPPFLAGS) $(ASFLAGS)
32 32 
 CXXFLAGS   += $(CPPFLAGS) $(CFLAGS)
33 
-YASMFLAGS  += $(IFLAGS:%=%/) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
33 
+YASMFLAGS  += $(IFLAGS:%=%/) -Pconfig.asm
34 34
35 35 
 HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
36 36 
 LDFLAGS    := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
libavcodec/x86/diracdsp_yasm.asm
History View file @ 9766d9c
... ... 
@@ -18,7 +18,7 @@
18 18 
 ;* 51, Inc., Foundation 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_RODATA
24 24 
 pw_3: times 8 dw 3
libavcodec/x86/dwt_yasm.asm
History View file @ 9766d9c
... ... 
@@ -19,7 +19,7 @@
19 19 
 ;* 51, Inc., Foundation 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_1: times 8 dw 1
libavcodec/x86/h264_chromamc_10bit.asm
History View file @ 9766d9c
... ... 
@@ -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 @ 9766d9c
... ... 
@@ -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_10bit.asm
History View file @ 9766d9c
... ... 
@@ -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 @ 9766d9c
... ... 
@@ -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 @ 9766d9c
... ... 
@@ -22,7 +22,7 @@
22 22 
 ;* 51, Inc., Foundation 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 
 %define W1sh2 22725 ; W1 = 90901 = 22725<<2 + 1
28 28 
 %define W2sh2 21407 ; W2 = 85627 = 21407<<2 - 1
libavcodec/x86/rv34dsp.asm
History View file @ 9766d9c
... ... 
@@ -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 @ 9766d9c
... ... 
@@ -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 @ 9766d9c
... ... 
@@ -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
libavfilter/x86/hqdn3d.asm
History View file @ 9766d9c
... ... 
@@ -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 @ 9766d9c
... ... 
@@ -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 @ 9766d9c
... ... 
@@ -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 @ 9766d9c
... ... 
@@ -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 @ 9766d9c
... ... 
@@ -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 @ 9766d9c
... ... 
@@ -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