summaryrefslogtreecommitdiffstats
path: root/DOCS/xml/en/encoding-guide.xml
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-08-18 02:29:37 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-08-18 02:29:37 +0300
commit95da34aa071d64b21ef3e952b987ba3dcee84ca0 (patch)
treeeabf4399e40fd270714c53d40688eadadfd4c5ff /DOCS/xml/en/encoding-guide.xml
parentf394231f5de9d1ff679f1b2da4d1f1b303ae914a (diff)
parent3961e12fca2f1ec10c64e3ff298828feecca52c9 (diff)
downloadmpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.bz2
mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.xz
Merge svn changes up to r29532
Diffstat (limited to 'DOCS/xml/en/encoding-guide.xml')
-rw-r--r--DOCS/xml/en/encoding-guide.xml8
1 files changed, 0 insertions, 8 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>