diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-07-30 20:10:16 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-07-30 20:10:16 +0000 |
| commit | 88410adf68da0aa991e1dfb14f6a2856197566ae (patch) | |
| tree | c5a2bfa09565466a36292d1afe074e4454ceae25 /DOCS | |
| parent | 850e9fa99b21fea46f26c0dc1de8712d9966a98f (diff) | |
| download | mpv-88410adf68da0aa991e1dfb14f6a2856197566ae.tar.bz2 mpv-88410adf68da0aa991e1dfb14f6a2856197566ae.tar.xz | |
Update documentation for libamr replacement by OpenCORE in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29461 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 4 | ||||
| -rw-r--r-- | DOCS/xml/en/encoding-guide.xml | 8 | ||||
| -rw-r--r-- | DOCS/xml/en/install.xml | 12 |
3 files changed, 4 insertions, 20 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 01bcc86f75..3db7b6e3d1 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -7860,10 +7860,6 @@ Adaptive PCM formats \- see the HTML documentation for details. 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 diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml index 706b34dbf5..1c7c5909c5 100644 --- a/DOCS/xml/en/encoding-guide.xml +++ b/DOCS/xml/en/encoding-guide.xml @@ -2622,14 +2622,6 @@ mencoder dvd://2 -o <replaceable>title2.avi</replaceable> -ovc lavc -lavcopts vc <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> diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index f8019fe3f9..21de5406bf 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -469,14 +469,10 @@ make install <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> |