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

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

Browse Source 
This is more consistent with the way we handle C #includes and
it simplifies the build system.
pull/6/merge
Diego Biurrun 13 years ago
parent 6860b4081d
commit 04581c8c77
34 changed files with 34 additions and 34 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
      Makefile
  2. 2
      libavcodec/x86/ac3dsp.asm
  3. 2
      libavcodec/x86/dct32.asm
  4. 2
      libavcodec/x86/deinterlace.asm
  5. 2
      libavcodec/x86/dsputil.asm
  6. 2
      libavcodec/x86/dsputilenc.asm
  7. 2
      libavcodec/x86/fft.asm
  8. 2
      libavcodec/x86/fmtconvert.asm
  9. 2
      libavcodec/x86/h264_chromamc.asm
  10. 2
      libavcodec/x86/h264_chromamc_10bit.asm
  11. 2
      libavcodec/x86/h264_deblock.asm
  12. 2
      libavcodec/x86/h264_deblock_10bit.asm
  13. 2
      libavcodec/x86/h264_idct.asm
  14. 2
      libavcodec/x86/h264_idct_10bit.asm
  15. 2
      libavcodec/x86/h264_intrapred.asm
  16. 2
      libavcodec/x86/h264_intrapred_10bit.asm
  17. 2
      libavcodec/x86/h264_qpel_10bit.asm
  18. 2
      libavcodec/x86/h264_weight.asm
  19. 2
      libavcodec/x86/h264_weight_10bit.asm
  20. 2
      libavcodec/x86/pngdsp.asm
  21. 2
      libavcodec/x86/proresdsp.asm
  22. 2
      libavcodec/x86/rv34dsp.asm
  23. 2
      libavcodec/x86/rv40dsp.asm
  24. 2
      libavcodec/x86/sbrdsp.asm
  25. 2
      libavcodec/x86/vc1dsp.asm
  26. 2
      libavcodec/x86/vp3dsp.asm
  27. 2
      libavcodec/x86/vp56dsp.asm
  28. 2
      libavcodec/x86/vp8dsp.asm
  29. 2
      libavfilter/x86/hqdn3d.asm
  30. 2
      libavresample/x86/audio_convert.asm
  31. 2
      libavresample/x86/audio_mix.asm
  32. 2
      libswscale/x86/input.asm
  33. 2
      libswscale/x86/output.asm
  34. 2
      libswscale/x86/scale.asm

2
Makefile
Unescape View File

@ -27,7 +27,7 @@ CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
CFLAGS += $(ECFLAGS) CFLAGS += $(ECFLAGS)
CCFLAGS = $(CPPFLAGS) $(CFLAGS) CCFLAGS = $(CPPFLAGS) $(CFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
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/ac3dsp.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

2
libavcodec/x86/dct32.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 32 SECTION_RODATA 32

2
libavcodec/x86/deinterlace.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
libavcodec/x86/dsputil.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
pb_f: times 16 db 15 pb_f: times 16 db 15

2
libavcodec/x86/dsputilenc.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 .text SECTION .text

2
libavcodec/x86/fft.asm
Unescape View File

@ -28,7 +28,7 @@
; in blocks as conventient to the vector size. ; in blocks as conventient to the vector size.
; i.e. {4x real, 4x imaginary, 4x real, ...} (or 2x respectively) ; i.e. {4x real, 4x imaginary, 4x real, ...} (or 2x respectively)
%include "x86util.asm" %include "libavutil/x86/x86util.asm"
%if ARCH_X86_64 %if ARCH_X86_64
%define pointer resq %define pointer resq

2
libavcodec/x86/fmtconvert.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_TEXT SECTION_TEXT

2
libavcodec/x86/h264_chromamc.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
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_deblock.asm
Unescape View File

@ -24,7 +24,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_deblock_10bit.asm
Unescape View File

@ -24,7 +24,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_idct.asm
Unescape View File

@ -26,7 +26,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_idct_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_intrapred.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_intrapred_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.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 .text SECTION .text

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

@ -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"
%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
libavcodec/x86/vc1dsp.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"
cextern pw_4 cextern pw_4
cextern pw_5 cextern pw_5

2
libavcodec/x86/vp3dsp.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"
; MMX-optimized functions cribbed from the original VP3 source code. ; MMX-optimized functions cribbed from the original VP3 source code.

2
libavcodec/x86/vp56dsp.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"
cextern pw_64 cextern pw_64

2
libavcodec/x86/vp8dsp.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
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