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.
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus,…
… soxr, theora. (microsoft#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
- Loading branch information
Showing
36 changed files
with
844 additions
and
194 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: fdk-aac | ||
| Version: 2018-07-08-1 | ||
| Version: 2018-07-08-2 | ||
| Homepage: https://github.com/mstorsjo/fdk-aac | ||
| Description: A standalone library of the Fraunhofer FDK AAC code |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/configure b/configure | ||
| index d6c4388..75b96c3 100644 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -4378,6 +4378,10 @@ msvc_common_flags(){ | ||
| -march=*) ;; | ||
| -lz) echo zlib.lib ;; | ||
| -lx264) echo libx264.lib ;; | ||
| + -lx265) echo libx265.lib ;; | ||
| + -lmp3lame) echo libmp3lame.lib ;; | ||
| + -liconv) echo libiconv.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,27 @@ | ||
| diff --git a/configure b/configure | ||
| index e7162dbc56..0f04af2a81 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6391,7 +6391,7 @@ enabled libvpx && { | ||
| fi | ||
| } | ||
|
|
||
| -enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack | ||
| +enabled libwavpack && { check_pkg_config libwavpack wavpack wavpack.h WavpackOpenFileOutput || check_lib libwavpack wavpack.h WavpackOpenFileOutput -lwavpack || check_lib libwavpack wavpack.h WavpackOpenFileOutput -llibwavpack || require libwavpack wavpack.h WavpackOpenFileOutput -lwavpackdll; } | ||
| 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; } | ||
| diff --git a/libavcodec/libwavpackenc.c b/libavcodec/libwavpackenc.c | ||
| index e84b074893..9adf39861b 100644 | ||
| --- a/libavcodec/libwavpackenc.c | ||
| +++ b/libavcodec/libwavpackenc.c | ||
| @@ -16,7 +16,7 @@ | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| */ | ||
|
|
||
| -#include <wavpack/wavpack.h> | ||
| +#include <wavpack.h> | ||
| #include <string.h> | ||
|
|
||
| #include "libavutil/attributes.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,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,14 @@ | ||
| diff --git a/configure b/configure | ||
| index b137669dd3..34a2e644c4 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6443,7 +6443,7 @@ 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" && | ||
| + { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs -ldl" && | ||
| warn "using libx264 without pkg-config"; } } && | ||
| require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && | ||
| check_cpp_condition libx262 x264.h "X264_MPEG2" | ||
|
|
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 34a2e644c4..0ea64bd306 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6447,7 +6447,9 @@ enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x | ||
| warn "using libx264 without pkg-config"; } } && | ||
| require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && | ||
| 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 || | ||
| + { require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" && | ||
| + warn "using libx265 without pkg-config"; } } && | ||
| require_cpp_condition libx265 x265.h "X265_BUILD >= 68" | ||
| 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,13 @@ | ||
| diff --git a/configure b/configure | ||
| index 2be953f7e7..e075949ffc 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -6497,6 +6497,7 @@ enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR | ||
| die "ERROR: OpenMAX IL headers not found"; } && enable omx | ||
| enabled openssl && { 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 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 || | ||
|
|
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
Oops, something went wrong.