Mercurial > mplayer.hg
changeset 29419:50589ac2c8cc
Update documentation for libamr replacement by OpenCORE in FFmpeg.
| author | diego |
|---|---|
| date | Thu, 30 Jul 2009 20:10:16 +0000 |
| parents | 7acdcd4d512a |
| children | 45fc33b8476c |
| files | DOCS/man/en/mplayer.1 DOCS/xml/en/encoding-guide.xml DOCS/xml/en/install.xml |
| diffstat | 3 files changed, 4 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Thu Jul 30 12:08:20 2009 +0000 +++ b/DOCS/man/en/mplayer.1 Thu Jul 30 20:10:16 2009 +0000 @@ -7860,10 +7860,6 @@ Free Lossless Audio Codec (FLAC) .IPs "g726\ " G.726 ADPCM -.IPs libamr_nb -3GPP Adaptive Multi-Rate (AMR) narrow-band -.IPs libamr_wb -3GPP Adaptive Multi-Rate (AMR) wide-band .IPs libfaac Advanced Audio Coding (AAC) \- using FAAC .IPs libmp3lame
--- a/DOCS/xml/en/encoding-guide.xml Thu Jul 30 12:08:20 2009 +0000 +++ b/DOCS/xml/en/encoding-guide.xml Thu Jul 30 20:10:16 2009 +0000 @@ -2622,14 +2622,6 @@ <entry>G.726 ADPCM</entry> </row> <row> - <entry>libamr_nb</entry> - <entry>3GPP Adaptive Multi-Rate (AMR) narrow-band</entry> -</row> -<row> - <entry>libamr_wb</entry> - <entry>3GPP Adaptive Multi-Rate (AMR) wide-band</entry> -</row> -<row> <entry>libfaac</entry> <entry>Advanced Audio Coding (AAC) - using FAAC</entry> </row>
--- a/DOCS/xml/en/install.xml Thu Jul 30 12:08:20 2009 +0000 +++ b/DOCS/xml/en/install.xml Thu Jul 30 20:10:16 2009 +0000 @@ -469,14 +469,10 @@ <title>AMR</title> <para> -Adaptive Multi-Rate speech codec is used in third generation (3G) mobile -phones. -Reference implementation is available from -<ulink url="http://www.3gpp.org">The 3rd Generation Partnership Project</ulink> -(free for private use). -To enable support, download and install support libraries for -<ulink url="http://www.penguin.cz/~utx/amr">AMR-NB and AMR-WB</ulink> -following the instructions on that page. Recompile MPlayer afterwards. +MPlayer can use the OpenCORE AMR libraries through FFmpeg. +Download the libraries for AMR-NB and AMR-WB from the +<ulink url="http://sourceforge.net/projects/opencore-amr/">opencore-amr</ulink> +project and install them according to the instructions on that page. </para> </sect2>