summaryrefslogtreecommitdiffstats
path: root/DOCS/xml
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-07-05 16:46:54 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-07-05 16:46:54 +0000
commit12066db4358e13e218e71a4ba2824db652940e4a (patch)
treed39dd61e0694d9e9a8c5f65f3729735b7678dca8 /DOCS/xml
parent2550f5d6b671507e016b5af4d160f5a1dd98ab34 (diff)
downloadmpv-12066db4358e13e218e71a4ba2824db652940e4a.tar.bz2
mpv-12066db4358e13e218e71a4ba2824db652940e4a.tar.xz
NSV added to formats, cinepak etc codec updates by Roberto Togni.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12760 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS/xml')
-rw-r--r--DOCS/xml/en/codecs.xml23
-rw-r--r--DOCS/xml/en/formats.xml17
2 files changed, 23 insertions, 17 deletions
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index d08738b4ae..df8dbd87d7 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -366,24 +366,13 @@ occurred. This recovery technique has no measurable speed penalty.
</sect3>
-<sect3 id="msvideo1">
-<title>MS Video1</title>
+<sect3 id="avicodecs">
+<title>MS Video1, Cinepak CVID, and other older codecs</title>
<para>
-This is a very old and very bad codec from Microsoft. In the past it was
-decoded with the <filename>msvidc32.dll</filename> Win32 codec, now we have
-our own open source implementation
-(by <ulink url="mailto:melanson@pcisys.net">Mike Melanson</ulink>).
-</para>
-</sect3>
-
-
-<sect3 id="cinepak-cvid">
-<title>Cinepak CVID</title>
-<para>
-<application>MPlayer</application> uses its own open source, multiplatform
-Cinepak decoder (by <ulink url="mailto:timf@csse.monash.edu.au">Dr. Tim Ferguson</ulink>)
-by default. It supports YUV outputs, so that hardware
-scaling is possible if the video output driver permits it.
+MPlayer is able to play most of the older codecs used in AVI and MOV files.
+In the past they were decoded with binary Win32 codecs, but now we have
+<emphasis role="bold">native codecs</emphasis> for most of them using
+<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>.
</para>
</sect3>
diff --git a/DOCS/xml/en/formats.xml b/DOCS/xml/en/formats.xml
index 98a9405b45..a4f102444e 100644
--- a/DOCS/xml/en/formats.xml
+++ b/DOCS/xml/en/formats.xml
@@ -331,6 +331,23 @@ The PVA specifications can be downloaded from the following address:
</sect3>
+<sect3 id="nsv">
+<title>NSV files</title>
+<para>
+NSV (NullSoft Video) is the file format used by the
+<application>Winamp</application> player to stream audio and video.
+Video is VP3, VP5 or VP6, audio is MP3, AAC or VLB.
+The audio only version of NSV has the <filename>.nsa</filename> extension.
+<application>MPlayer</application> can play both NSV streams and files.
+Please note that most files from the
+<ulink url="http://www.winamp.com">Winamp site</ulink> use VLB audio, that
+can't be decoded yet. Moreover streams from that site need an extra
+depacketization layer that still has to be implemented (those files are
+unplayable anyway because they use VLB audio).
+</para>
+</sect3>
+
+
<sect3 id="gif">
<title>GIF files</title>
<para>