mirror of https://git.ffmpeg.org/ffmpeg.git
Revert "build: disable iconv by default."
This reverts commit9ad3cd5b5f
. The misdetection on OS X should be fixed, we will only get problem reports if auto-detection is enabled. (cherry picked from commit3f78f0904b
)
This commit is contained in:
parent
1ea3248290
commit
0b198e38c5
|
@ -188,7 +188,7 @@ External library support:
|
|||
--enable-fontconfig enable fontconfig
|
||||
--enable-frei0r enable frei0r video filtering
|
||||
--enable-gnutls enable gnutls [no]
|
||||
--enable-iconv enable iconv [no]
|
||||
--enable-iconv enable iconv [autodetect]
|
||||
--enable-libaacplus enable AAC+ encoding via libaacplus [no]
|
||||
--enable-libass enable libass subtitles rendering [no]
|
||||
--enable-libbluray enable BluRay reading using libbluray [no]
|
||||
|
@ -4053,7 +4053,7 @@ enabled vdpau &&
|
|||
disable vdpau
|
||||
|
||||
# Funny iconv installations are not unusual, so check it after all flags have been set
|
||||
enabled iconv && { check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || die "ERROR: iconv not found"; }
|
||||
disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv
|
||||
|
||||
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
|
||||
enabled coverage && add_cflags "-fprofile-arcs -ftest-coverage" && add_ldflags "-fprofile-arcs -ftest-coverage"
|
||||
|
|
Loading…
Reference in New Issue