diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-12 23:53:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-12 23:57:00 +0200 |
| commit | 620c6292b1a7cdaaa3e258c899b37e68954589b8 (patch) | |
| tree | cce4c5fcb0a86343dcbb30c116e0b54dc6122309 /doc | |
| parent | f9c823df13f47d285ed0bd406906e138df4e8ae1 (diff) | |
| parent | 0da29727eadcc4e1f1ed661d1db4caed6ceb17c9 (diff) | |
| download | ffmpeg-620c6292b1a7cdaaa3e258c899b37e68954589b8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Fix Ogg demuxer dependencies
build: Fix FLAC demuxer dependencies
flac: Move flac functions shared between libraries to flac common code
build: Fix CAF demuxer dependencies
build: Fix MP2 muxer dependencies
build: Add missing build rules for the ISMV muxer
configure: Drop redundant mxf_d10 test dependency declaration
Support AAC encoding via the external library fdk-aac
libavcodec: Add more AAC profiles
dct/fft-test: use a replacement getopt() if the system has none present.
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi index 11907fdec4..7c313b148f 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -26,8 +26,8 @@ instructions. To enable using OpenJPEG in FFmpeg, pass @code{--enable-libopenjp @section OpenCORE and VisualOn libraries -Spun off Google Android sources, OpenCore and VisualOn libraries provide -encoders for a number of audio codecs. +Spun off Google Android sources, OpenCore, VisualOn and Fraunhofer +libraries provide encoders for a number of audio codecs. @float NOTE OpenCORE and VisualOn libraries are under the Apache License 2.0 @@ -63,6 +63,14 @@ Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the instructions for installing the library. Then pass @code{--enable-libvo-amrwbenc} to configure to enable it. +@subsection Fraunhofer AAC library + +Libav can make use of the Fraunhofer AAC library for AAC encoding. + +Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the +instructions for installing the library. +Then pass @code{--enable-libfdk-aac} to configure to enable it. + @section LAME FFmpeg can make use of the LAME library for MP3 encoding. |