diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 11:45:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:05:19 +0200 |
| commit | 614cf1a6133a143961798c5d87c9bffc2ca0da9e (patch) | |
| tree | bd72a843fa20e50578e1c8a8231262150136b322 /configure | |
| parent | b69b075ac607419a840da798b089de8ea7630d4b (diff) | |
| parent | 4f2b469da5e4ae221718ae479f6af627cfdebb91 (diff) | |
| download | ffmpeg-614cf1a6133a143961798c5d87c9bffc2ca0da9e.tar.gz | |
Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'
* commit '4f2b469da5e4ae221718ae479f6af627cfdebb91':
Add a libfdk-aac decoder
Conflicts:
configure
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -201,7 +201,7 @@ External library support: --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394 and libraw1394 [no] --enable-libfaac enable AAC encoding via libfaac [no] - --enable-libfdk-aac enable AAC encoding via libfdk-aac [no] + --enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no] --enable-libflite enable flite (voice synthesis) support via libflite [no] --enable-libfreetype enable libfreetype [no] --enable-libgme enable Game Music Emu via libgme [no] @@ -1988,6 +1988,7 @@ libaacplus_encoder_deps="libaacplus" libcelt_decoder_deps="libcelt" libfaac_encoder_deps="libfaac" libfaac_encoder_select="audio_frame_queue" +libfdk_aac_decoder_deps="libfdk_aac" libfdk_aac_encoder_deps="libfdk_aac" libfdk_aac_encoder_select="audio_frame_queue" libgme_demuxer_deps="libgme" |