forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1245 from microsoft/master
[ffmpeg] Update to 5.0 (microsoft#23312)
- Loading branch information
Showing
24 changed files
with
125 additions
and
216 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
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
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
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
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
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
This file was deleted.
Oops, something went wrong.
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
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 |
|---|---|---|
| @@ -1,12 +1,14 @@ | ||
| diff --git a/configure b/configure | ||
| index f3688ad..26e512e 100755 | ||
| index 2be953f7e7..e075949ffc 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6556,6 +6556,7 @@ enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR | ||
| enabled omx && require_headers OMX_Core.h | ||
| enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || | ||
| @@ -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
This file was deleted.
Oops, something went wrong.
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
30 changes: 0 additions & 30 deletions
30
ports/ffmpeg/0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
ports/ffmpeg/0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1,13 +1,23 @@ | ||
| From d5fca748d76602a912590b64022560283db6fae6 Mon Sep 17 00:00:00 2001 | ||
| From: Matt Oliver <[email protected]> | ||
| Date: Sat, 30 Oct 2021 14:09:29 +1100 | ||
| Subject: [PATCH] libx264: Do not explicitly set X264_API_IMPORTS | ||
|
|
||
| --- | ||
| configure | 8 +++----- | ||
| libavcodec/libx264.c | 4 ---- | ||
| 2 files changed, 3 insertions(+), 9 deletions(-) | ||
|
|
||
| diff --git a/configure b/configure | ||
| index 62753ef..018764e 100755 | ||
| index ede8f9777b..b35728aace 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6508,11 +6508,8 @@ enabled libvpx && { | ||
| @@ -6535,11 +6535,8 @@ enabled libvpx && { | ||
| enabled libwebp && { | ||
| enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion | ||
| enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } | ||
| -enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode || | ||
| - { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs -ldl" && | ||
| - { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && | ||
| - warn "using libx264 without pkg-config"; } } && | ||
| - require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && | ||
| - check_cpp_condition libx262 x264.h "X264_MPEG2" | ||
|
|
@@ -17,12 +27,12 @@ index 62753ef..018764e 100755 | |
| { { 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++"; } && | ||
| diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c | ||
| index 4ddc497..0152d30 100644 | ||
| index 21f434d06d..efbc9608c7 100644 | ||
| --- a/libavcodec/libx264.c | ||
| +++ b/libavcodec/libx264.c | ||
| @@ -32,10 +32,6 @@ | ||
| #include "packet_internal.h" | ||
| @@ -34,10 +34,6 @@ | ||
| #include "atsc_a53.h" | ||
| #include "sei.h" | ||
|
|
||
| -#if defined(_MSC_VER) | ||
| -#define X264_API_IMPORTS 1 | ||
|
|
@@ -31,3 +41,6 @@ index 4ddc497..0152d30 100644 | |
| #include <x264.h> | ||
| #include <float.h> | ||
| #include <math.h> | ||
| -- | ||
| 2.33.1.windows.1 | ||
|
|
||
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
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/configure b/configure | ||
| index 2829d79..697a504 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6589,7 +6589,7 @@ fi | ||
|
|
||
| if enabled sdl2; then | ||
| SDL2_CONFIG="${cross_prefix}sdl2-config" | ||
| - test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent | ||
| + test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent | ||
| if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then | ||
| sdl2_cflags=$("${SDL2_CONFIG}" --cflags) | ||
| sdl2_extralibs=$("${SDL2_CONFIG}" --libs) |
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 |
Oops, something went wrong.