summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-18 16:14:25 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-18 16:14:25 +0000
commitefa7170803691a6f4ea0c9f09e0048b9e57539a0 (patch)
treefe019634eb3309ab23b0c369593c174fee5ce375 /DOCS
parentfe51c57b4f37eec1dfcf5ff8a1fb3f01dfba1c05 (diff)
downloadmpv-efa7170803691a6f4ea0c9f09e0048b9e57539a0.tar.bz2
mpv-efa7170803691a6f4ea0c9f09e0048b9e57539a0.tar.xz
add new audio and video codecs to libavcodec list
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22718 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/xml/en/encoding-guide.xml32
1 files changed, 32 insertions, 0 deletions
diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml
index 9ba9eedad5..ff588bcdcb 100644
--- a/DOCS/xml/en/encoding-guide.xml
+++ b/DOCS/xml/en/encoding-guide.xml
@@ -2453,6 +2453,14 @@ You can encode to the following codecs (more or less up to date):
<entry>lossless JPEG</entry>
</row>
<row>
+ <entry>targa</entry>
+ <entry>Targa</entry>
+</row>
+<row>
+ <entry>bmp</entry>
+ <entry>BMP image</entry>
+</row>
+<row>
<entry>h261</entry>
<entry>H.261</entry>
</row>
@@ -2525,6 +2533,10 @@ You can encode to the following codecs (more or less up to date):
<entry>Sorenson H.263 used in Flash Video</entry>
</row>
<row>
+ <entry>flashsv</entry>
+ <entry>Flash Screen Video</entry>
+</row>
+<row>
<entry>dvvideo</entry>
<entry>Sony Digital Video</entry>
</row>
@@ -2532,6 +2544,10 @@ You can encode to the following codecs (more or less up to date):
<entry>snow</entry>
<entry>FFmpeg's experimental wavelet-based codec</entry>
</row>
+<row>
+ <entry>zbmv</entry>
+ <entry>Zip Blocks Motion Video</entry>
+</row>
</tbody>
</tgroup>
</informaltable>
@@ -2578,6 +2594,22 @@ mencoder dvd://2 -o <replaceable>title2.avi</replaceable> -ovc lavc -lavcopts vc
<entry>sonic</entry>
<entry>experimental lossy/lossless codec</entry>
</row>
+<row>
+ <entry>vorbis</entry>
+ <entry>Xiph Ogg Vorbis codec</entry>
+</row>
+<row>
+ <entry>aiff</entry>
+ <entry>AIFF/AIFF-C codec</entry>
+</row>
+<row>
+ <entry>gsm</entry>
+ <entry>GSM-MS codec</entry>
+</row>
+<row>
+ <entry>wma</entry>
+ <entry>Windows Media Audio codec</entry>
+</row>
</tbody>
</tgroup>
</informaltable>