Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix NASM include directive

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
pull/2/head
Dave Yeo 14 years ago committed by Ronald S. Bultje
parent 48f7163f13
commit cc73511e8e
23 changed files with 42 additions and 42 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. 4
      libavcodec/x86/ac3dsp.asm
  3. 4
      libavcodec/x86/dct32_sse.asm
  4. 4
      libavcodec/x86/deinterlace.asm
  5. 2
      libavcodec/x86/dsputil_yasm.asm
  6. 4
      libavcodec/x86/dsputilenc_yasm.asm
  7. 2
      libavcodec/x86/fft_mmx.asm
  8. 4
      libavcodec/x86/fmtconvert.asm
  9. 4
      libavcodec/x86/h264_chromamc.asm
  10. 4
      libavcodec/x86/h264_chromamc_10bit.asm
  11. 4
      libavcodec/x86/h264_deblock.asm
  12. 4
      libavcodec/x86/h264_deblock_10bit.asm
  13. 4
      libavcodec/x86/h264_idct.asm
  14. 4
      libavcodec/x86/h264_idct_10bit.asm
  15. 4
      libavcodec/x86/h264_intrapred.asm
  16. 4
      libavcodec/x86/h264_intrapred_10bit.asm
  17. 4
      libavcodec/x86/h264_qpel_10bit.asm
  18. 2
      libavcodec/x86/h264_weight.asm
  19. 4
      libavcodec/x86/h264_weight_10bit.asm
  20. 4
      libavcodec/x86/vc1dsp_yasm.asm
  21. 4
      libavcodec/x86/vp3dsp.asm
  22. 4
      libavcodec/x86/vp56dsp.asm
  23. 4
      libavcodec/x86/vp8dsp.asm

2
Makefile
Unescape View File

@ -26,7 +26,7 @@ IFLAGS := -I. -I$(SRC_PATH)
CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
CFLAGS += $(ECFLAGS) CFLAGS += $(ECFLAGS)
CCFLAGS = $(CFLAGS) CCFLAGS = $(CFLAGS)
YASMFLAGS += $(IFLAGS) -Pconfig.asm YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
HOSTCFLAGS += $(IFLAGS) HOSTCFLAGS += $(IFLAGS)
LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)

4
libavcodec/x86/ac3dsp.asm
Unescape View File

@ -19,8 +19,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA

4
libavcodec/x86/dct32_sse.asm
Unescape View File

@ -19,8 +19,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA 32 SECTION_RODATA 32

4
libavcodec/x86/deinterlace.asm
Unescape View File

@ -20,8 +20,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA

2
libavcodec/x86/dsputil_yasm.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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
SECTION_RODATA SECTION_RODATA
pb_f: times 16 db 15 pb_f: times 16 db 15

4
libavcodec/x86/dsputilenc_yasm.asm
Unescape View File

@ -21,8 +21,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION .text SECTION .text

2
libavcodec/x86/fft_mmx.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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%ifdef ARCH_X86_64 %ifdef ARCH_X86_64
%define pointer resq %define pointer resq

4
libavcodec/x86/fmtconvert.asm
Unescape View File

@ -19,8 +19,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_TEXT SECTION_TEXT

4
libavcodec/x86/h264_chromamc.asm
Unescape View File

@ -20,8 +20,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA

4
libavcodec/x86/h264_chromamc_10bit.asm
Unescape View File

@ -22,8 +22,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA

4
libavcodec/x86/h264_deblock.asm
Unescape View File

@ -24,8 +24,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION .text SECTION .text

4
libavcodec/x86/h264_deblock_10bit.asm
Unescape View File

@ -24,8 +24,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA

4
libavcodec/x86/h264_idct.asm
Unescape View File

@ -26,8 +26,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA

4
libavcodec/x86/h264_idct_10bit.asm
Unescape View File

@ -22,8 +22,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA

4
libavcodec/x86/h264_intrapred.asm
Unescape View File

@ -22,8 +22,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA

4
libavcodec/x86/h264_intrapred_10bit.asm
Unescape View File

@ -22,8 +22,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA

4
libavcodec/x86/h264_qpel_10bit.asm
Unescape View File

@ -22,8 +22,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
SECTION .text SECTION .text

4
libavcodec/x86/h264_weight_10bit.asm
Unescape View File

@ -22,8 +22,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA 32 SECTION_RODATA 32

4
libavcodec/x86/vc1dsp_yasm.asm
Unescape View File

@ -19,8 +19,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
cextern pw_4 cextern pw_4
cextern pw_5 cextern pw_5

4
libavcodec/x86/vp3dsp.asm
Unescape View File

@ -19,8 +19,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
; MMX-optimized functions cribbed from the original VP3 source code. ; MMX-optimized functions cribbed from the original VP3 source code.

4
libavcodec/x86/vp56dsp.asm
Unescape View File

@ -20,8 +20,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
cextern pw_64 cextern pw_64

4
libavcodec/x86/vp8dsp.asm
Unescape View File

@ -20,8 +20,8 @@
;* 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 "libavutil/x86/x86inc.asm" %include "x86inc.asm"
%include "libavutil/x86/x86util.asm" %include "x86util.asm"
SECTION_RODATA SECTION_RODATA

Write Preview
Loading…
Cancel
Save