From e07e88cd82f78644ddcb10d7d3e0dd624fffe274 Mon Sep 17 00:00:00 2001 From: Kieran Kunhya Date: Fri, 29 Jan 2016 17:23:33 -0800 Subject: avcodec: Remove libvo-aacenc support. The internal encoder is superior to libvo-aacenc. Signed-off-by: Timothy Gu --- doc/encoders.texi | 25 ------------------------- doc/general.texi | 12 ++---------- 2 files changed, 2 insertions(+), 35 deletions(-) (limited to 'doc') diff --git a/doc/encoders.texi b/doc/encoders.texi index 33699df2b5..c485f903b7 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1075,31 +1075,6 @@ Set MPEG audio original flag when set to 1. The default value is 0 @end table -@anchor{libvo-aacenc} -@section libvo-aacenc - -VisualOn AAC encoder. - -Requires the presence of the libvo-aacenc headers and library during -configuration. You need to explicitly configure the build with -@code{--enable-libvo-aacenc --enable-version3}. - -This encoder is considered to be worse than the -@ref{aacenc,,native FFmpeg AAC encoder}, according to -multiple sources. - -@subsection Options - -The VisualOn AAC encoder only support encoding AAC-LC and up to 2 -channels. It is also CBR-only. - -@table @option - -@item b -Set bit rate in bits/s. - -@end table - @section libvo-amrwbenc VisualOn Adaptive Multi-Rate Wideband encoder. diff --git a/doc/general.texi b/doc/general.texi index d66e60a9c5..4e6698c480 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -53,14 +53,6 @@ instructions for installing the libraries. Then pass @code{--enable-libopencore-amrnb} and/or @code{--enable-libopencore-amrwb} to configure to enable them. -@subsection VisualOn AAC encoder library - -FFmpeg can make use of the VisualOn AACenc 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-libvo-aacenc} to configure to enable it. - @subsection VisualOn AMR-WB encoder library FFmpeg can make use of the VisualOn AMR-WBenc library for AMR-WB encoding. @@ -881,8 +873,8 @@ following image formats are supported: @item Name @tab Encoding @tab Decoding @tab Comments @item 8SVX exponential @tab @tab X @item 8SVX fibonacci @tab @tab X -@item AAC @tab E @tab X - @tab encoding supported through external library libfaac, libfdk-aac and libvo-aacenc +@item AAC @tab EX @tab X + @tab encoding supported through internal encoder and external libraries libfaac and libfdk-aac @item AAC+ @tab E @tab IX @tab encoding supported through external library libfdk-aac @item AC-3 @tab IX @tab IX -- cgit v1.2.3