0005-fix-nasm.patch 2.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
  2. --- a/libavcodec/x86/Makefile
  3. +++ b/libavcodec/x86/Makefile
  4. @@ -158,6 +158,8 @@ X86ASM-OBJS-$(CONFIG_ALAC_DECODER) += x86/alacdsp.o
  5. X86ASM-OBJS-$(CONFIG_APNG_DECODER) += x86/pngdsp.o
  6. X86ASM-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsidct.o
  7. +ifdef ARCH_X86_64
  8. X86ASM-OBJS-$(CONFIG_CFHD_ENCODER) += x86/cfhdencdsp.o
  9. +endif
  10. X86ASM-OBJS-$(CONFIG_CFHD_DECODER) += x86/cfhddsp.o
  11. X86ASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o x86/synth_filter.o
  12. X86ASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp.o \
  13. @@ -175,15 +177,21 @@ x86/hevc_sao_10bit.o
  14. X86ASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o
  15. X86ASM-OBJS-$(CONFIG_LSCR_DECODER) += x86/pngdsp.o
  16. +ifdef ARCH_X86_64
  17. X86ASM-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
  18. +endif
  19. X86ASM-OBJS-$(CONFIG_MPEG4_DECODER) += x86/xvididct.o
  20. X86ASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
  21. +ifdef ARCH_X86_64
  22. X86ASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
  23. X86ASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
  24. +endif
  25. X86ASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o
  26. X86ASM-OBJS-$(CONFIG_SBC_ENCODER) += x86/sbcdsp.o
  27. X86ASM-OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc.o
  28. X86ASM-OBJS-$(CONFIG_TAK_DECODER) += x86/takdsp.o
  29. +ifdef ARCH_X86_64
  30. X86ASM-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
  31. +endif
  32. X86ASM-OBJS-$(CONFIG_TTA_DECODER) += x86/ttadsp.o
  33. X86ASM-OBJS-$(CONFIG_TTA_ENCODER) += x86/ttaencdsp.o
  34. X86ASM-OBJS-$(CONFIG_UTVIDEO_DECODER) += x86/utvideodsp.o
  35. diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile
  36. --- a/libavfilter/x86/Makefile
  37. +++ b/libavfilter/x86/Makefile
  38. @@ -44,6 +44,8 @@
  39. X86ASM-OBJS-$(CONFIG_AFIR_FILTER) += x86/af_afir.o
  40. X86ASM-OBJS-$(CONFIG_ANLMDN_FILTER) += x86/af_anlmdn.o
  41. +ifdef ARCH_X86_64
  42. X86ASM-OBJS-$(CONFIG_ATADENOISE_FILTER) += x86/vf_atadenoise.o
  43. +endif
  44. X86ASM-OBJS-$(CONFIG_BLEND_FILTER) += x86/vf_blend.o
  45. X86ASM-OBJS-$(CONFIG_BWDIF_FILTER) += x86/vf_bwdif.o
  46. X86ASM-OBJS-$(CONFIG_COLORSPACE_FILTER) += x86/colorspacedsp.o
  47. @@ -62,6 +62,8 @@ X86ASM-OBJS-$(CONFIG_LUT3D_FILTER) += x86/vf_lut3d.o
  48. X86ASM-OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += x86/vf_maskedclamp.o
  49. X86ASM-OBJS-$(CONFIG_MASKEDMERGE_FILTER) += x86/vf_maskedmerge.o
  50. +ifdef ARCH_X86_64
  51. X86ASM-OBJS-$(CONFIG_NLMEANS_FILTER) += x86/vf_nlmeans.o
  52. +endif
  53. X86ASM-OBJS-$(CONFIG_OVERLAY_FILTER) += x86/vf_overlay.o
  54. X86ASM-OBJS-$(CONFIG_PP7_FILTER) += x86/vf_pp7.o
  55. X86ASM-OBJS-$(CONFIG_PSNR_FILTER) += x86/vf_psnr.o