aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCurtis J Bezault <curtbezault@gmail.com>2019-08-14 14:46:42 -0700
committerGitHub <noreply@github.com>2019-08-14 14:46:42 -0700
commitb69fd4adae51f423a7354d9a38017bfb80d18c1f (patch)
tree96110bf2745aa240e9376cf4534384d43b98b542
parentaa0c404c2cf6fe6cafa7b59922baed1adc8deb18 (diff)
parent8cbef1424afff5e4be3bf0e1121058465c7d6f6a (diff)
downloadvcpkg-b69fd4adae51f423a7354d9a38017bfb80d18c1f.tar.gz
vcpkg-b69fd4adae51f423a7354d9a38017bfb80d18c1f.zip
Merge pull request #7608 from JackBoosY/dev/jack/ffmpeg_avresample
[ffmpeg]Add feature avresample.
-rw-r--r--ports/ffmpeg/CONTROL5
-rw-r--r--ports/ffmpeg/portfile.cmake4
2 files changed, 8 insertions, 1 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index 3bbf544c1..abf59b857 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -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
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index ea69db42f..079880ab3 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -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")