Merge pull request #7608 from JackBoosY/dev/jack/ffmpeg_avresample

[ffmpeg]Add feature avresample.
This commit is contained in:
Curtis J Bezault 2019-08-14 14:46:42 -07:00 committed by GitHub
commit b69fd4adae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions

View File

@ -1,5 +1,5 @@
Source: ffmpeg
Version: 4.1-9
Version: 4.1-10
Homepage: https://ffmpeg.org
Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
@ -45,3 +45,6 @@ Description: allow nonfree and unredistributable libraries
Feature: gpl
Description: allow GPL licensed libraries
Feature: avresample
Description: Libav audio resampling library support in ffmpeg

View File

@ -125,6 +125,10 @@ else()
set(OPTIONS "${OPTIONS} --disable-bzlib")
endif()
if("avresample" IN_LIST FEATURES)
set(OPTIONS "${OPTIONS} --enable-avresample")
endif()
set(OPTIONS_CROSS "")
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")