summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-19 19:21:09 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-19 19:21:09 +0000
commit82a7ca46c8925873da95fa289933fc544f44f906 (patch)
tree4e49a0cd9e6df37771a73256ed59fdea334b3581 /DOCS
parenteb6922f2dffe1172142d74d935f6411fdb3bf42c (diff)
downloadmpv-82a7ca46c8925873da95fa289933fc544f44f906.tar.bz2
mpv-82a7ca46c8925873da95fa289933fc544f44f906.tar.xz
split sonic into sonic/sonicls and wma into wmav1/wmav2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22749 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/xml/en/encoding-guide.xml14
1 files changed, 11 insertions, 3 deletions
diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml
index f403a4f3bf..178df08d53 100644
--- a/DOCS/xml/en/encoding-guide.xml
+++ b/DOCS/xml/en/encoding-guide.xml
@@ -2600,7 +2600,11 @@ mencoder dvd://2 -o <replaceable>title2.avi</replaceable> -ovc lavc -lavcopts vc
</row>
<row>
<entry>sonic</entry>
- <entry>experimental lossy/lossless codec</entry>
+ <entry>experimental FFmpeg lossy codec</entry>
+</row>
+<row>
+ <entry>sonicls</entry>
+ <entry>experimental FFmpeg lossless codec</entry>
</row>
<row>
<entry>vorbis</entry>
@@ -2615,8 +2619,12 @@ mencoder dvd://2 -o <replaceable>title2.avi</replaceable> -ovc lavc -lavcopts vc
<entry>GSM-MS codec</entry>
</row>
<row>
- <entry>wma</entry>
- <entry>Windows Media Audio codec</entry>
+ <entry>wmav1</entry>
+ <entry>Windows Media Audio v1 codec</entry>
+</row>
+<row>
+ <entry>wmav2</entry>
+ <entry>Windows Media Audio v2 codec</entry>
</row>
</tbody>
</tgroup>