diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-09 18:25:22 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-10 09:55:25 +0100 |
| commit | 0b198e38c52ca716def04433876b8438b4bc218e (patch) | |
| tree | 5e03dbbcaf22fd3a8272e2bbcdaa79df33b6719d | |
| parent | 1ea3248290a36c5fbde7863d6ad8cf91e18f3fc8 (diff) | |
| download | ffmpeg-0b198e38c52ca716def04433876b8438b4bc218e.tar.gz | |
Revert "build: disable iconv by default."
This reverts commit 9ad3cd5b5f848eb3cd033be515d34296f099148b.
The misdetection on OS X should be fixed, we will only get
problem reports if auto-detection is enabled.
(cherry picked from commit 3f78f0904bfa012b171cecfae87af7c6909c8ede)
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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" |