RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 

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

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-31 13:57:09 +01:00
parent 264f12342c 04581c8c77
commit 9766d9c985
17 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.mak
View File

@ -30,7 +30,7 @@ CFLAGS += $(ECFLAGS)
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
CXXFLAGS += $(CPPFLAGS) $(CFLAGS)
YASMFLAGS += $(IFLAGS:%=%/) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)

2
libavcodec/x86/diracdsp_yasm.asm
View File

@ -18,7 +18,7 @@
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "x86util.asm"
%include "libavutil/x86/x86util.asm"
SECTION_RODATA
pw_3: times 8 dw 3

2
libavcodec/x86/dwt_yasm.asm
View File

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

2
libavcodec/x86/h264_chromamc_10bit.asm
View File

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

2
libavcodec/x86/h264_qpel_10bit.asm
View File

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

2
libavcodec/x86/h264_weight_10bit.asm
View File

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

2
libavcodec/x86/pngdsp.asm
View File

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

2
libavcodec/x86/proresdsp.asm
View File

@ -22,7 +22,7 @@
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "x86util.asm"
%include "libavutil/x86/x86util.asm"
%define W1sh2 22725 ; W1 = 90901 = 22725<<2 + 1
%define W2sh2 21407 ; W2 = 85627 = 21407<<2 - 1

2
libavcodec/x86/rv34dsp.asm
View File

@ -19,7 +19,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%include "x86util.asm"
%include "libavutil/x86/x86util.asm"
SECTION_RODATA
pw_row_coeffs: times 4 dw 13

2
libavcodec/x86/rv40dsp.asm
View File

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

2
libavcodec/x86/sbrdsp.asm
View File

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

2
libavfilter/x86/hqdn3d.asm
View File

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

2
libavresample/x86/audio_convert.asm
View File

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

2
libavresample/x86/audio_mix.asm
View File

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

2
libswscale/x86/input.asm
View File

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

2
libswscale/x86/output.asm
View File

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

2
libswscale/x86/scale.asm
View File

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