virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Merge commit 'bcaedef1189a3531aa4dfb020627eb0133ffa89c'

Browse Source 
* commit 'bcaedef1189a3531aa4dfb020627eb0133ffa89c':
  configure: Add require_cpp_condition() convenience function

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-09-26 17:42:19 -03:00
commit c83c164f05
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -1379,6 +1379,14 @@ require_header(){
check_header "$header" "$@" || die "ERROR: $header header not found"
}
require_cpp_condition(){
log require "$@"
header="$1"
condition="$2"
shift 2
check_cpp_condition "$header" "$condition" "$@" || die "ERROR: $condition not satisfied"
}
use_pkg_config(){
log use_pkg_config "$@"
pkg="$1"
@ -6017,13 +6025,11 @@ enabled libwebp && {
enabled libx264 && { use_pkg_config x264 "stdint.h x264.h" x264_encoder_encode ||
{ require libx264 "stdint.h x264.h" x264_encoder_encode -lx264 &&
warn "using libx264 without pkg-config"; } } &&
{ check_cpp_condition x264.h "X264_BUILD >= 118" ||
die "ERROR: libx264 must be installed and version must be >= 0.118."; } &&
require_cpp_condition x264.h "X264_BUILD >= 118" &&
{ check_cpp_condition x264.h "X264_MPEG2" &&
enable libx262; }
enabled libx265 && require_pkg_config x265 x265.h x265_api_get &&
{ check_cpp_condition x265.h "X265_BUILD >= 68" ||
die "ERROR: libx265 version must be >= 68."; }
require_cpp_condition x265.h "X265_BUILD >= 68"
enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
enabled libzimg && require_pkg_config "zimg >= 2.3.0" zimg.h zimg_get_api_version