[Mplayer-cvslog] CVS: main/DOCS codecs.html,1.61,1.62 documentation.html,1.239,1.240 encoding.html,1.39,1.40
Winner of tha face compo
gabucino at mplayerhq.hu
Sat May 4 18:29:13 CEST 2002
Update of /cvsroot/mplayer/main/DOCS
In directory mail:/var/tmp.root/cvs-serv2720
Modified Files:
codecs.html documentation.html encoding.html
Log Message:
small update
Index: codecs.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/codecs.html,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- codecs.html 8 Apr 2002 16:40:52 -0000 1.61
+++ codecs.html 4 May 2002 16:29:10 -0000 1.62
@@ -23,7 +23,7 @@
<P>The most important ones above all:</P>
<UL>
<LI>MPEG1 (VCD) and MPEG2 (DVD) video</LI>
-<LI>DivX ;-), OpenDivX (DivX4), DivX 5.00, 3ivX and other MPEG4 variants</LI>
+<LI>DivX ;-), OpenDivX (DivX4), DivX 5.01, 3ivX, M$ MPEG4 v2 and other MPEG4 variants</LI>
<LI>Windows Media Video 7 (WMV1) and 8 (WMV2) used in .wmv files</LI>
<LI>Cinepak and Intel Indeo codecs (3.1,3.2,4.1,5.0)</LI>
<LI>MJPEG, AVID, VCR2, ASV2 and other hardware formats</LI>
@@ -103,14 +103,15 @@
<TD></TD><TD><FONT CLASS="text">hard postprocessing, CPU intensive (like level 4 with divxds)</FONT></TD></TR>
</TABLE>
+
<P><B><A NAME=2.2.1.2>2.2.1.2. FFmpeg DivX/libavcodec</A></B></P>
<P>Beginning with version 0.4.2,
<A HREF="http://ffmpeg.sourceforge.net">FFmpeg</A> contains an
<B>open source</B> DivX codec, which is compatible with the traditional DivX.
<B>MPlayer</B> supports this codec, making it possible to <B>watch
-DivX/DivX4/DivX5 movies on non-x86 platforms</B>. Furthermore it offers higher
-<B>DivX/DivX4/DivX5</B> decoding speed than the Win32 codecs or the original
+DivX/DivX4/DivX5/MP42 movies on non-x86 platforms</B>. Furthermore it offers higher
+decoding speed than the Win32 codecs or the original
DivX4 library!</P>
<P>It also contains a lot of nice codecs, such as RealVideo 1.0, MJPEG, h263,
Index: documentation.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- documentation.html 4 May 2002 15:57:44 -0000 1.239
+++ documentation.html 4 May 2002 16:29:10 -0000 1.240
@@ -294,8 +294,8 @@
<P><B>MPlayer</B> is a movie player for LINUX (runs on many other Unices, and
<B>non-x86</B> CPUs, see <A HREF="#6">section 6</A>). It plays most MPEG, VOB,
-AVI, VIVO, ASF/WMV, QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ files,
-supported by many native, XAnim, and
+AVI, OGG, VIVO, ASF/WMV, QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ
+files, supported by many native, XAnim, and
Win32 DLL codecs. You can watch <B>VideoCD</B>, <B>SVCD</B>, <B>DVD</B>,
<B>3ivx</B>, and even <B>DivX</B> movies too (and you don't need the avifile
library at all!). The another big feature of mplayer is the wide range of
@@ -309,14 +309,7 @@
shaded subtitles (<B>10 supported types!!!</B>) with european/ISO 8859-1,2
(hungarian, english, czech, etc), cyrillic, korean fonts, and OSD?</P>
-<P><B>MPlayer</B> is basically GPL, but contains some non-GPL code which is not
-allowed to be distributed in binary form, and also contains the OpenDivX
-library which has special license. We are still developing towards GPL.</P>
-
-<P>Distributing <B>MPlayer</B> in the form of binaries and/or binary packages
-is currently impossible, speaking about both <B>technical</B> and <B>law</B>
-areas. Detailed information can be found in the second part of <A HREF="users_against_developers.html#binary">this file</A>,
-and it is recommended to read it.</P>
+<P><B>MPlayer</B> is under GPL v2 license.</P>
<P>My player is rock solid playing damaged MPEG files (useful for some VCDs),
and it plays bad AVI files which are unplayable with the famous
@@ -372,6 +365,8 @@
MOV/VIVO/RM/FLI/NUV fileformats support, native CRAM, Cinepak, ADPCM codecs,
and support for XAnim's binary codecs; DVD subtitles support, first
release of MEncoder, TV grabbing, cache, liba52, countless fixes.</LI>
+<LI><B>MPlayer 0.90 "?"</B> May? ??, 2002<BR>
+ </LI>
</UL></P>
<P><B><A NAME=1.3>1.3. Installation</A></B></P>
@@ -428,10 +423,12 @@
<P><B><I>CODECS</I></B></P>
<UL>
-<LI><B>libavcodec</B> : If you want to use this DivX3/DivX4/DivX5/etc codec, check the
+<LI><B>libavcodec</B> : If you want to use this DivX3/DivX4/DivX5/MP42/etc
+codec, check the
<A HREF="codecs.html#2.2.1.2">2.2.1.2</A> section before compiling. Features :<BR>
<UL>
- <LI>you can <B>gain <I>DivX/DivX4/DivX5</I> playing on non-x86 machines</B></LI>
+ <LI>you can <B>gain <I>DivX/DivX4/DivX5/MP42</I> playing on non-x86
+ machines</B></LI>
<LI>RealVideo 1.0/VIVO/MJPEG/h263/others playing and encoding</LI>
<LI>this codec has the <B>greatest decoding speed</B> for DivX and DivX4/DivX5
movies (even faster than the original DivX4 library itself) ! Recommended!</LI>
@@ -519,7 +516,7 @@
section</A> of the TV-out documentation, to know what features of your card is
supported under Linux/MPlayer. If you have a <B>Radeon</B>, <B>Rage128</B>
or <B>Mach64</B> (Rage XL/Mobility, Xpert98) card, we have a
-<B>XXX_vid</B> driver for you, with optional TV out ! Check <A
+<B>Vidix</B> driver for you, with optional TV out ! Check <A
HREF="video.html#2.3.1.14">this</A> section ! <U><B>If you are non-Linux
user</B></U>, read <A HREF="video.html#2.3.1.15">Vidix</A> documentation !</LI>
Index: encoding.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- encoding.html 27 Apr 2002 09:27:31 -0000 1.39
+++ encoding.html 4 May 2002 16:29:10 -0000 1.40
@@ -18,7 +18,7 @@
<P><B>MEncoder</B> (<B>MPlayer</B>'s Movie Encoder) is a simple movie encoder,
designed to encode MPlayer-playable movies
-(<B>AVI/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET</B>) to other MPlayer-playable
+(<B>AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET</B>) to other MPlayer-playable
formats (see below). It can encode with various codecs, like <B>DivX4</B> (1 or
2 passes), libavcodec, <B>PCM</B>/<B>MP3</B>/<B>VBRMP3</B> audio. Also has
stream copying and video resizing abilities.</P>
@@ -196,15 +196,13 @@
AVI (DivX) files, you have be aware that AVI headers don't store this
value. Thus, the only solution is rescaling.</P>
-<P><B>MEncoder</B> can scale input images if they come in YV12 format (for example:
- ffdivx, odivx drivers, or mpeg1/2). The output size is specified with the
- <CODE>-x</CODE>, and <CODE>-y</CODE> options. Furthermore, there are some
- rescaling filters in <B>MEncoder</B>, see the manpage for them !
- They can be specified with the <CODE>-sws</CODE> option. If not specified,
- <B>MEncoder</B> will use 0 : fast bilinear.</P>
+<P>The scaling process is handled by the <I>'scale'</I> video filter:
+ <CODE>-vop scale=X:Y</CODE>. Its quality can be set with the
+ <CODE>-sws</CODE> option. If it's not specified, <B>MEncoder</B> will use 0 :
+ fast bilinear.</P>
-<P>Rescaling is very simple :<BR>
-<CODE> mencoder sample-svcd.mpg -divx4opts br=1300 -x 640 -y 480 -sws 2 -o output.avi</CODE></P>
+<P>Usage :<BR>
+<CODE> mencoder sample-svcd.mpg -divx4opts br=1300 -vop scale=640:480 -sws 2 -o output.avi</CODE></P>
<P><B><A NAME=2.4.3.3>2.4.3.3. Stream copying</B></P>
@@ -236,7 +234,7 @@
the video and/or audio streams. It also fixes files with broken interleaving,
thus the <CODE>-ni</CODE> option won't be needed for them anymore.</P>
-<P>Command : <CODE>mencoder input.avi -ovc copy -oac copy -o output.avi</CODE></P>
+<P>Command : <CODE>mencoder -idx input.avi -ovc copy -oac copy -o output.avi</CODE></P>
<P><B><A NAME=2.4.3.5>2.4.3.5. Encoding with the <I>libavcodec</I> codec family</B></P>
@@ -347,20 +345,6 @@
</TR>
<TR>
<TD><FONT CLASS="text">
- <I>-x</I> width in pixels</TD>
- <TD><FONT CLASS="text">
- rescale output video to given pixels width
- </TD>
-</TR>
-<TR>
- <TD><FONT CLASS="text">
- <I>-y</I> height in pixels</TD>
- <TD><FONT CLASS="text">
- rescale output video to given pixels height
- </TD>
-</TR>
-<TR>
- <TD><FONT CLASS="text">
<I>-sws</I> 0-2</TD>
<TD><FONT CLASS="text">
type of scaling method<BR>
@@ -375,8 +359,6 @@
<TD><FONT CLASS="text">
Encode with the given codec (codec names are from codecs.conf). Examples:<BR>
<B>help</B> - get list of available codecs<BR>
- <B>null</B> - do not create a video stream in the output AVI<BR>
- <B>raw</B> - create uncompressed video<BR>
<B>rawrgb</B> - ?<BR>
<B>copy</B> - no encoding, just copy the stream (only from AVI/ASF now)<BR>
<B>divx4</B> - encode to DivX4<BR>
@@ -463,7 +445,7 @@
<CODE> mencoder -dvd 2 -o title2.avi -ovc lavc -lavcopts vcodec=mjpeg -ffourcc mjpg</CODE></P>
<P>Encoding from DVD, title 2, with rescaling :<BR>
- <CODE> mencoder -dvd 2 -x 640 -y 480 -sws 2 -o title2.avi</CODE></P>
+ <CODE> mencoder -dvd 2 -vop scale=640:480 -sws 2 -o title2.avi</CODE></P>
<P>Encoding from HTTP :<BR>
<CODE> mencoder http://mplayer.hq/example.avi -o example.avi</CODE></P>
More information about the MPlayer-cvslog
mailing list