falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Fix NASM include directive 

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
tags/n0.9
Dave Yeo Ronald S. Bultje 14 years ago
parent
48f7163f13
commit
cc73511e8e
23 changed files with 42 additions and 42 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      Makefile
  2. +2
    -2
      libavcodec/x86/ac3dsp.asm
  3. +2
    -2
      libavcodec/x86/dct32_sse.asm
  4. +2
    -2
      libavcodec/x86/deinterlace.asm
  5. +1
    -1
      libavcodec/x86/dsputil_yasm.asm
  6. +2
    -2
      libavcodec/x86/dsputilenc_yasm.asm
  7. +1
    -1
      libavcodec/x86/fft_mmx.asm
  8. +2
    -2
      libavcodec/x86/fmtconvert.asm
  9. +2
    -2
      libavcodec/x86/h264_chromamc.asm
  10. +2
    -2
      libavcodec/x86/h264_chromamc_10bit.asm
  11. +2
    -2
      libavcodec/x86/h264_deblock.asm
  12. +2
    -2
      libavcodec/x86/h264_deblock_10bit.asm
  13. +2
    -2
      libavcodec/x86/h264_idct.asm
  14. +2
    -2
      libavcodec/x86/h264_idct_10bit.asm
  15. +2
    -2
      libavcodec/x86/h264_intrapred.asm
  16. +2
    -2
      libavcodec/x86/h264_intrapred_10bit.asm
  17. +2
    -2
      libavcodec/x86/h264_qpel_10bit.asm
  18. +1
    -1
      libavcodec/x86/h264_weight.asm
  19. +2
    -2
      libavcodec/x86/h264_weight_10bit.asm
  20. +2
    -2
      libavcodec/x86/vc1dsp_yasm.asm
  21. +2
    -2
      libavcodec/x86/vp3dsp.asm
  22. +2
    -2
      libavcodec/x86/vp56dsp.asm
  23. +2
    -2
      libavcodec/x86/vp8dsp.asm

+ 1
- 1
Makefile 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)




+ 2
- 2
libavcodec/x86/ac3dsp.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA SECTION_RODATA




+ 2
- 2
libavcodec/x86/dct32_sse.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA 32 SECTION_RODATA 32




+ 2
- 2
libavcodec/x86/deinterlace.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA SECTION_RODATA




+ 1
- 1
libavcodec/x86/dsputil_yasm.asm 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


+ 2
- 2
libavcodec/x86/dsputilenc_yasm.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION .text SECTION .text




+ 1
- 1
libavcodec/x86/fft_mmx.asm 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


+ 2
- 2
libavcodec/x86/fmtconvert.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_TEXT SECTION_TEXT




+ 2
- 2
libavcodec/x86/h264_chromamc.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA SECTION_RODATA




+ 2
- 2
libavcodec/x86/h264_chromamc_10bit.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA SECTION_RODATA




+ 2
- 2
libavcodec/x86/h264_deblock.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION .text SECTION .text




+ 2
- 2
libavcodec/x86/h264_deblock_10bit.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA SECTION_RODATA




+ 2
- 2
libavcodec/x86/h264_idct.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA SECTION_RODATA




+ 2
- 2
libavcodec/x86/h264_idct_10bit.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA SECTION_RODATA




+ 2
- 2
libavcodec/x86/h264_intrapred.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA SECTION_RODATA




+ 2
- 2
libavcodec/x86/h264_intrapred_10bit.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA SECTION_RODATA




+ 2
- 2
libavcodec/x86/h264_qpel_10bit.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA 32 SECTION_RODATA 32




+ 1
- 1
libavcodec/x86/h264_weight.asm 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




+ 2
- 2
libavcodec/x86/h264_weight_10bit.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA 32 SECTION_RODATA 32




+ 2
- 2
libavcodec/x86/vc1dsp_yasm.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


cextern pw_4 cextern pw_4
cextern pw_5 cextern pw_5


+ 2
- 2
libavcodec/x86/vp3dsp.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


; MMX-optimized functions cribbed from the original VP3 source code. ; MMX-optimized functions cribbed from the original VP3 source code.




+ 2
- 2
libavcodec/x86/vp56dsp.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


cextern pw_64 cextern pw_64




+ 2
- 2
libavcodec/x86/vp8dsp.asm 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 "libavutil/x86/x86util.asm"
%include "x86inc.asm"
%include "x86util.asm"


SECTION_RODATA SECTION_RODATA




Write Preview
Loading…
Cancel
Save