Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

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

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/6/merge
Michael Niedermayer 12 years ago
parent 264f12342c 04581c8c77
commit 9766d9c985
17 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      common.mak
  2. 2
      libavcodec/x86/diracdsp_yasm.asm
  3. 2
      libavcodec/x86/dwt_yasm.asm
  4. 2
      libavcodec/x86/h264_chromamc_10bit.asm
  5. 2
      libavcodec/x86/h264_qpel_10bit.asm
  6. 2
      libavcodec/x86/h264_weight_10bit.asm
  7. 2
      libavcodec/x86/pngdsp.asm
  8. 2
      libavcodec/x86/proresdsp.asm
  9. 2
      libavcodec/x86/rv34dsp.asm
  10. 2
      libavcodec/x86/rv40dsp.asm
  11. 2
      libavcodec/x86/sbrdsp.asm
  12. 2
      libavfilter/x86/hqdn3d.asm
  13. 2
      libavresample/x86/audio_convert.asm
  14. 2
      libavresample/x86/audio_mix.asm
  15. 2
      libswscale/x86/input.asm
  16. 2
      libswscale/x86/output.asm
  17. 2
      libswscale/x86/scale.asm

2
common.mak
Unescape View File

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

2
libavcodec/x86/diracdsp_yasm.asm
Unescape View File

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

2
libavcodec/x86/dwt_yasm.asm
Unescape View File

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

2
libavcodec/x86/h264_chromamc_10bit.asm
Unescape View File

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

2
libavcodec/x86/h264_qpel_10bit.asm
Unescape View File

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

2
libavcodec/x86/h264_weight_10bit.asm
Unescape View File

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

2
libavcodec/x86/pngdsp.asm
Unescape View File

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

2
libavcodec/x86/proresdsp.asm
Unescape View File

@ -22,7 +22,7 @@
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* 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 W1sh2 22725 ; W1 = 90901 = 22725<<2 + 1
%define W2sh2 21407 ; W2 = 85627 = 21407<<2 - 1 %define W2sh2 21407 ; W2 = 85627 = 21407<<2 - 1

2
libavcodec/x86/rv34dsp.asm
Unescape View File

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

2
libavcodec/x86/rv40dsp.asm
Unescape View File

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

2
libavcodec/x86/sbrdsp.asm
Unescape View File

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

2
libavfilter/x86/hqdn3d.asm
Unescape View File

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

2
libavresample/x86/audio_convert.asm
Unescape View File

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

2
libavresample/x86/audio_mix.asm
Unescape View File

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

2
libswscale/x86/input.asm
Unescape View File

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

2
libswscale/x86/output.asm
Unescape View File

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

2
libswscale/x86/scale.asm
Unescape View File

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

Write Preview
Loading…
Cancel
Save