mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 05:29:01 +08:00
1b4d69f302
* [amd-amf] Update to 1.4.29 * [ffnvcodec] Update to 11.1.5.2 * [mfx-dispatch] Fix pkgconfig * [ffmpeg] Update to 6.0 * update versions * [amd-amd] Fix merge * Update ffmpeg.json * ffmpeg: Remove libpng dependency. Ffmpeg doesnt have a libpng dependency. All thats needed for png support is zlib which has its own option already * Update ffmpeg.json * [ignition-common3] patch for ffmpeg3 * [freerdp] Update to 2.11.1 * Revert "Merge pull request #1 from autoantwort/ffmpeg" This reverts commitb52416c67d, reversing changes made to8fdd44e901. * Update ffmpeg.json * Update ffmpeg.json --------- Co-authored-by: Leander Schulten <Leander.Schulten@rwth-aachen.de>
56 lines
2.6 KiB
Diff
56 lines
2.6 KiB
Diff
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
|
|
--- a/libavcodec/x86/Makefile
|
|
+++ b/libavcodec/x86/Makefile
|
|
@@ -158,6 +158,8 @@ X86ASM-OBJS-$(CONFIG_ALAC_DECODER) += x86/alacdsp.o
|
|
X86ASM-OBJS-$(CONFIG_APNG_DECODER) += x86/pngdsp.o
|
|
X86ASM-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsidct.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_CFHD_ENCODER) += x86/cfhdencdsp.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_CFHD_DECODER) += x86/cfhddsp.o
|
|
X86ASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o x86/synth_filter.o
|
|
X86ASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp.o \
|
|
@@ -175,15 +177,21 @@ x86/hevc_sao_10bit.o
|
|
X86ASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o
|
|
X86ASM-OBJS-$(CONFIG_LSCR_DECODER) += x86/pngdsp.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_MPEG4_DECODER) += x86/xvididct.o
|
|
X86ASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
|
|
X86ASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o
|
|
X86ASM-OBJS-$(CONFIG_SBC_ENCODER) += x86/sbcdsp.o
|
|
X86ASM-OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc.o
|
|
X86ASM-OBJS-$(CONFIG_TAK_DECODER) += x86/takdsp.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_TTA_DECODER) += x86/ttadsp.o
|
|
X86ASM-OBJS-$(CONFIG_TTA_ENCODER) += x86/ttaencdsp.o
|
|
X86ASM-OBJS-$(CONFIG_UTVIDEO_DECODER) += x86/utvideodsp.o
|
|
diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile
|
|
--- a/libavfilter/x86/Makefile
|
|
+++ b/libavfilter/x86/Makefile
|
|
@@ -44,6 +44,8 @@
|
|
X86ASM-OBJS-$(CONFIG_AFIR_FILTER) += x86/af_afir.o
|
|
X86ASM-OBJS-$(CONFIG_ANLMDN_FILTER) += x86/af_anlmdn.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_ATADENOISE_FILTER) += x86/vf_atadenoise.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_BLEND_FILTER) += x86/vf_blend.o
|
|
X86ASM-OBJS-$(CONFIG_BWDIF_FILTER) += x86/vf_bwdif.o
|
|
X86ASM-OBJS-$(CONFIG_COLORSPACE_FILTER) += x86/colorspacedsp.o
|
|
@@ -62,6 +62,8 @@ X86ASM-OBJS-$(CONFIG_LUT3D_FILTER) += x86/vf_lut3d.o
|
|
X86ASM-OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += x86/vf_maskedclamp.o
|
|
X86ASM-OBJS-$(CONFIG_MASKEDMERGE_FILTER) += x86/vf_maskedmerge.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_NLMEANS_FILTER) += x86/vf_nlmeans.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_OVERLAY_FILTER) += x86/vf_overlay.o
|
|
X86ASM-OBJS-$(CONFIG_PP7_FILTER) += x86/vf_pp7.o
|
|
X86ASM-OBJS-$(CONFIG_PSNR_FILTER) += x86/vf_psnr.o
|