diff options
| author | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-18 22:24:18 +0000 |
|---|---|---|
| committer | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-18 22:24:18 +0000 |
| commit | 6e2cee8ede6a9034e2d40c0b0f84cd3e575a9adb (patch) | |
| tree | e71097c981e4cf42785e9d0aacfe754cb141f3bf /DOCS | |
| parent | ac7321963996f9f5ca230e547aa8d4b5cf0c3686 (diff) | |
| download | mpv-6e2cee8ede6a9034e2d40c0b0f84cd3e575a9adb.tar.bz2 mpv-6e2cee8ede6a9034e2d40c0b0f84cd3e575a9adb.tar.xz | |
applied Melanson's patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5188 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/codecs.html | 12 | ||||
| -rw-r--r-- | DOCS/documentation.html | 7 |
2 files changed, 14 insertions, 5 deletions
diff --git a/DOCS/codecs.html b/DOCS/codecs.html index 1d6562fed4..778e631bbb 100644 --- a/DOCS/codecs.html +++ b/DOCS/codecs.html @@ -164,10 +164,14 @@ K6/2 500, without framedrop.</P> <P><B><A NAME=2.2.1.3>2.2.1.3. XAnim codecs</A></B></P> -<P>Foreword: using (some) XAnim codecs with other program than XAnim, is -<B><I>ILLEGAL</I></B>. It is <B>YOUR</B> responsibility to read its license, -and do accordingly. The authors of <B>MPlayer</B> can't be held responsible for -any unlawful act of the user.</P> +<P>Foreword: +Be advised that the XAnim binary codecs are packaged with a piece of text +claiming to be a legally binding software license which, among other +absurdities, forbids the user to use the codecs in conjunction with any +program other than XAnim. As the XAnim author has yet to bring legal +action against anyone for codec-related issues, the MPlayer developers +don't lose too much sleep over this and you probably shouldn't, either. +</P> <P>So yes, <B>MPlayer</B> can use XAnim's codecs for decoding. It's very easy to enable them:</P> diff --git a/DOCS/documentation.html b/DOCS/documentation.html index e40ea6b67c..406b128b8e 100644 --- a/DOCS/documentation.html +++ b/DOCS/documentation.html @@ -1496,7 +1496,12 @@ Anyone has closer info?</P> <UL> <LI>MS Video1 codec open-source implementation</LI> <LI>FLI demuxer, decoder</LI> - <LI>Generic ADPCM decoder (supports stereo IMA4 too)</LI> + <LI>Unified ADPCM Decoder (supports IMA/DVI, MS ADPCM, several others)</LI> + <LI>FILM (.cpk) file demuxer</LI> + <LI>RoQ file demuxer</LI> + <LI>RoQ Audio/Video decoder</LI> + <LI>QT SMC decoder</LI> + <LI>QT RLE decoder</LI> </UL></LI> <LI><B><A HREF="mailto:ranma@gmx.at">Tobias Diedrich</A></B> |