diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
| commit | 95da34aa071d64b21ef3e952b987ba3dcee84ca0 (patch) | |
| tree | eabf4399e40fd270714c53d40688eadadfd4c5ff /DOCS/xml | |
| parent | f394231f5de9d1ff679f1b2da4d1f1b303ae914a (diff) | |
| parent | 3961e12fca2f1ec10c64e3ff298828feecca52c9 (diff) | |
| download | mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.bz2 mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.xz | |
Merge svn changes up to r29532
Diffstat (limited to 'DOCS/xml')
| -rw-r--r-- | DOCS/xml/en/encoding-guide.xml | 8 | ||||
| -rw-r--r-- | DOCS/xml/en/install.xml | 12 |
2 files changed, 4 insertions, 16 deletions
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 86afaaf65d..dd03e00377 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -448,14 +448,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> |