diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-10 02:21:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-10 02:21:04 +0100 |
| commit | 07ab8d3369b2fee9d3871a5f65313be5d9fe5c89 (patch) | |
| tree | a8f582910c0e612f0974118bc1d28cd57e567115 | |
| parent | f0a5f71074d914dde1585f12ae5101bd639b83e1 (diff) | |
| parent | 3f78f0904bfa012b171cecfae87af7c6909c8ede (diff) | |
| download | ffmpeg-07ab8d3369b2fee9d3871a5f65313be5d9fe5c89.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Revert "build: disable iconv by default."
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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] @@ -4059,7 +4059,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" |