-
-
Notifications
You must be signed in to change notification settings - Fork 240
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Proper fix for the qtmultimedia ffmpeg plugin support
- Loading branch information
Showing
24 changed files
with
2,312 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| diff --git a/configure b/configure | ||
| index 1f0b9497cb..3243e23021 100644 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -5697,17 +5697,19 @@ case $target_os in | ||
| ;; | ||
| win32|win64) | ||
| disable symver | ||
| - if enabled shared; then | ||
| +# if enabled shared; then | ||
| # Link to the import library instead of the normal static library | ||
| # for shared libs. | ||
| LD_LIB='%.lib' | ||
| # Cannot build both shared and static libs with MSVC or icl. | ||
| - disable static | ||
| - fi | ||
| +# disable static | ||
| +# fi | ||
| ! enabled small && test_cmd $windres --version && enable gnu_windres | ||
| enabled x86_32 && check_ldflags -LARGEADDRESSAWARE | ||
| add_cppflags -DWIN32_LEAN_AND_MEAN | ||
| shlibdir_default="$bindir_default" | ||
| + LIBPREF="" | ||
| + LIBSUF=".lib" | ||
| SLIBPREF="" | ||
| SLIBSUF=".dll" | ||
| SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| diff --git a/configure b/configure | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6162,6 +6162,7 @@ EOF | ||
| test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX" | ||
| case "$objformat" in | ||
| elf*) enabled debug && append X86ASMFLAGS $x86asm_debug ;; | ||
| + win*) enabled debug && append X86ASMFLAGS "-g" ;; | ||
| esac | ||
|
|
||
| enabled avx512 && check_x86asm avx512_external "vmovdqa32 [eax]{k1}{z}, zmm0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c | ||
| --- a/fftools/cmdutils.c | ||
| +++ b/fftools/cmdutils.c | ||
| @@ -51,6 +51,8 @@ | ||
| #include "fopen_utf8.h" | ||
| #include "opt_common.h" | ||
| #ifdef _WIN32 | ||
| +#define _WIN32_WINNT 0x0502 | ||
| +#define WIN32_LEAN_AND_MEAN | ||
| #include <windows.h> | ||
| #include "compat/w32dlfcn.h" | ||
| #endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| diff --git a/configure b/configure | ||
| index 3243e23021..6d3f31fc95 100644 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -4284,6 +4284,9 @@ for opt do | ||
| --libfuzzer=*) | ||
| libfuzzer_path="$optval" | ||
| ;; | ||
| + --debug) | ||
| + enable debug_configure | ||
| + ;; | ||
| *) | ||
| optname="${opt%%=*}" | ||
| optname="${optname#--}" | ||
| @@ -6630,7 +6633,11 @@ fi | ||
|
|
||
| enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion || | ||
| check_lib zlib zlib.h zlibVersion -lz; } | ||
| -enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 | ||
| +if enabled debug_configure; then | ||
| + enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2d | ||
| +else | ||
| + enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 | ||
| +fi | ||
| enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma | ||
|
|
||
| enabled zlib && test_exec $zlib_extralibs <<EOF && enable zlib_gzip | ||
| @@ -6793,7 +6800,11 @@ enabled libshaderc && require_pkg_config spirv_compiler "shaderc >= 2019. | ||
| enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer | ||
| enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init || | ||
| require libsmbclient libsmbclient.h smbc_init -lsmbclient; } | ||
| -enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ | ||
| +if enabled debug_configure; then | ||
| + enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ | ||
| +else | ||
| + enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ | ||
| +fi | ||
| enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr | ||
| enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init | ||
| enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| diff --git a/configure b/configure | ||
| index 6d3f31fc95..f5f4a769cc 100644 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6761,7 +6761,8 @@ if enabled libmfx; then | ||
| fi | ||
|
|
||
| enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load | ||
| -enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs | ||
| +enabled libmp3lame && { check_lib libmp3lame lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs || | ||
| + require libmp3lame lame/lame.h lame_set_VBR_quality -llibmp3lame-static -llibmpghip-static $libm_extralibs; } | ||
| enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine || | ||
| require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; } | ||
| enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei -lnppif || | ||
| @@ -6805,7 +6806,7 @@ if enabled debug_configure; then | ||
| else | ||
| enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ | ||
| fi | ||
| -enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr | ||
| +enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr -lm | ||
| enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init | ||
| enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init | ||
| enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket | ||
| @@ -6888,6 +6889,8 @@ enabled openal && { check_pkg_config openal "openal >= 1.1" "AL/al.h" | ||
| enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel || | ||
| check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || | ||
| check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL || | ||
| + check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32|| | ||
| + check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl || | ||
| die "ERROR: opencl not found"; } && | ||
| { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" || | ||
| test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" || | ||
| @@ -6914,6 +6917,7 @@ enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" ope | ||
| check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || | ||
| check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || | ||
| check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || | ||
| + check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -lcrypt32 -lAdvapi32 -lUser32|| | ||
| die "ERROR: openssl not found"; } | ||
| enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init | ||
| enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create && | ||
| @@ -7215,7 +7219,7 @@ enabled amf && | ||
| if enabled libc_iconv; then | ||
| check_func_headers iconv.h iconv | ||
| elif enabled iconv; then | ||
| - check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv | ||
| + check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv || check_lib iconv iconv.h iconv -liconv -llibcharset | ||
| fi | ||
|
|
||
| enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| diff --git a/configure b/configure | ||
| index d6c4388..75b96c3 100644 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -4378,6 +4378,11 @@ msvc_common_flags(){ | ||
| -march=*) ;; | ||
| -lz) echo zlib.lib ;; | ||
| -lx264) echo libx264.lib ;; | ||
| + -lx265) echo libx265.lib ;; | ||
| + -lmp3lame) echo libmp3lame.lib ;; | ||
| + -liconv) echo iconv.lib ;; | ||
| + -llibcharset) echo charset.lib ;; | ||
| + -lm) ;; | ||
| -lstdc++) ;; | ||
| -l*) echo ${flag#-l}.lib ;; | ||
| -LARGEADDRESSAWARE) echo $flag ;; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/configure b/configure | ||
| index b137669dd3..34c92230f4 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6331,7 +6331,7 @@ enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2. | ||
| enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new | ||
| enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion | ||
| enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || | ||
| - { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && | ||
| + { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac -lm -lstdc++ && | ||
| warn "using libfdk without pkg-config"; } } | ||
| flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" | ||
| enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/configure b/configure | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6730,7 +6730,10 @@ | ||
| [ "$toolchain" != "msvc" ] || | ||
| require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && | ||
| check_cpp_condition libx262 x264.h "X264_MPEG2" | ||
| -enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && | ||
| +enabled libx265 && { check_pkg_config libx265 x265 x265.h x265_api_get || | ||
| + { { check_lib libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" || | ||
| + require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++"; } && | ||
| + warn "using libx265 without pkg-config"; } } && | ||
| require_cpp_condition libx265 x265.h "X265_BUILD >= 89" | ||
| enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" | ||
| enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/configure b/configure | ||
| index 2be953f7e7..e075949ffc 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6497,6 +6497,7 @@ enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0 | ||
| { enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } || | ||
| { enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } || | ||
| check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || | ||
| check_pkg_config openssl openssl openssl/ssl.h SSL_library_init || | ||
| + check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto $pthreads_extralibs -ldl || | ||
| check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto || | ||
| check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || | ||
| check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --color -Naur src_old/libavcodec/mf_utils.c src/libavcodec/mf_utils.c | ||
| --- src_old/libavcodec/mf_utils.c 2020-07-11 05:26:17.000000000 +0700 | ||
| +++ src/libavcodec/mf_utils.c 2020-11-13 12:55:57.226976400 +0700 | ||
| @@ -22,6 +22,11 @@ | ||
| #define _WIN32_WINNT 0x0602 | ||
| #endif | ||
|
|
||
| +#if !defined(WINVER) || WINVER < 0x0602 | ||
| +#undef WINVER | ||
| +#define WINVER 0x0602 | ||
| +#endif | ||
| + | ||
| #include "mf_utils.h" | ||
| #include "libavutil/pixdesc.h" | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| configure | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/configure b/configure | ||
| index 900505756b..8d1388a347 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6476,7 +6476,7 @@ enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h z | ||
| enabled libzvbi && require_pkg_config libzvbi zvbi-0.2 libzvbi.h vbi_decoder_new && | ||
| { test_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" || | ||
| enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; } | ||
| -enabled libxml2 && require_pkg_config libxml2 libxml-2.0 libxml2/libxml/xmlversion.h xmlCheckVersion | ||
| +enabled libxml2 && require_pkg_config libxml2 libxml-2.0 libxml/xmlversion.h xmlCheckVersion | ||
| enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt.h mbedtls_x509_crt_init || | ||
| check_pkg_config mbedtls mbedtls mbedtls/ssl.h mbedtls_ssl_init || | ||
| check_lib mbedtls mbedtls/ssl.h mbedtls_ssl_init -lmbedtls -lmbedx509 -lmbedcrypto || | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S | ||
| index 89d69e7f6c..4bc1607a7a 100644 | ||
| --- a/libswscale/aarch64/yuv2rgb_neon.S | ||
| +++ b/libswscale/aarch64/yuv2rgb_neon.S | ||
| @@ -169,19 +169,19 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1 | ||
| sqdmulh v26.8h, v26.8h, v0.8h // ((Y1*(1<<3) - y_offset) * y_coeff) >> 15 | ||
| sqdmulh v27.8h, v27.8h, v0.8h // ((Y2*(1<<3) - y_offset) * y_coeff) >> 15 | ||
|
|
||
| -.ifc \ofmt,argb // 1 2 3 0 | ||
| +.ifc \ofmt,argb | ||
| compute_rgba v5.8b,v6.8b,v7.8b,v4.8b, v17.8b,v18.8b,v19.8b,v16.8b | ||
| .endif | ||
|
|
||
| -.ifc \ofmt,rgba // 0 1 2 3 | ||
| +.ifc \ofmt,rgba | ||
| compute_rgba v4.8b,v5.8b,v6.8b,v7.8b, v16.8b,v17.8b,v18.8b,v19.8b | ||
| .endif | ||
|
|
||
| -.ifc \ofmt,abgr // 3 2 1 0 | ||
| +.ifc \ofmt,abgr | ||
| compute_rgba v7.8b,v6.8b,v5.8b,v4.8b, v19.8b,v18.8b,v17.8b,v16.8b | ||
| .endif | ||
|
|
||
| -.ifc \ofmt,bgra // 2 1 0 3 | ||
| +.ifc \ofmt,bgra | ||
| compute_rgba v6.8b,v5.8b,v4.8b,v7.8b, v18.8b,v17.8b,v16.8b,v19.8b | ||
| .endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/configure b/configure | ||
| index 2829d79..697a504 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -4221,9 +4221,6 @@ | ||
| if disabled autodetect; then | ||
|
|
||
| - # Unless iconv is explicitely disabled by the user, we still want to probe | ||
| - # for the iconv from the libc. | ||
| - disabled iconv || enable libc_iconv | ||
|
|
||
| disable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST | ||
| disable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| Subject: [PATCH] fix d3d11 | ||
| --- | ||
| Index: qsv.c | ||
| IDEA additional info: | ||
| Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | ||
| <+>UTF-8 | ||
| =================================================================== | ||
| diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c | ||
| --- a/libavcodec/qsv.c | ||
| +++ b/libavcodec/qsv.c | ||
| @@ -383,7 +383,11 @@ | ||
| int ff_qsv_init_internal_session(AVCodecContext *avctx, QSVSession *qs, | ||
| const char *load_plugins, int gpu_copy) | ||
| { | ||
| +#if CONFIG_D3D11VA | ||
| + mfxIMPL impl = MFX_IMPL_AUTO_ANY | MFX_IMPL_VIA_D3D11; | ||
| +#else | ||
| mfxIMPL impl = MFX_IMPL_AUTO_ANY; | ||
| +#endif | ||
| mfxVersion ver = { { QSV_VERSION_MINOR, QSV_VERSION_MAJOR } }; | ||
| mfxInitParam init_par = { MFX_IMPL_AUTO_ANY }; | ||
|
|
Oops, something went wrong.
ee3bd4fThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎉 Ta-daaa, freshly created APKs are available: arm64-android
Other architectures