diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-10 01:42:27 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-10 01:42:27 +0000 |
| commit | ec0bb2e24c54162dabc11c1f1d9fe6764786fde8 (patch) | |
| tree | 3c1b20789c3569a1acf9368f10ed8a7d3adbb613 /DOCS | |
| parent | b688b6ee3a2e60abac26b8b03a6fe0624a41b14d (diff) | |
| download | mpv-ec0bb2e24c54162dabc11c1f1d9fe6764786fde8.tar.bz2 mpv-ec0bb2e24c54162dabc11c1f1d9fe6764786fde8.tar.xz | |
Cosmetics: Converted 2 spaces to one in section titles, changed some ugly
linebreaks and put "." after sentences in codecs.html.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7700 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/codecs.html | 53 | ||||
| -rw-r--r-- | DOCS/documentation.html | 8 | ||||
| -rw-r--r-- | DOCS/encoding.html | 57 | ||||
| -rw-r--r-- | DOCS/video.html | 6 |
4 files changed, 64 insertions, 60 deletions
diff --git a/DOCS/codecs.html b/DOCS/codecs.html index fff5e23e52..e61e26cb5e 100644 --- a/DOCS/codecs.html +++ b/DOCS/codecs.html @@ -10,7 +10,7 @@ <BODY> -<H2><A NAME="codecs">2.2 Supported codecs</A></H2> +<H2><A NAME="codecs">2.2 Supported codecs</A></H2> <H3><A NAME="video_codecs">2.2.1 Video codecs</A></H3> @@ -130,7 +130,7 @@ movies without dropped frames on my K6/2 500.</P> -<H4><A NAME="xanim">2.2.1.3 XAnim codecs</A></H4> +<H4><A NAME="xanim">2.2.1.3 XAnim codecs</A></H4> <P>Foreword:<BR> Be advised that the XAnim binary codecs are packaged with a piece of text @@ -163,7 +163,7 @@ <B>3ivX</B>, <B>h263</B>.</P> -<H4><A NAME="vivo_video">2.2.1.4 VIVO video</A></H4> +<H4><A NAME="vivo_video">2.2.1.4 VIVO video</A></H4> <P><B>MPlayer</B> can play Vivo (1.0 and 2.0) videos. The most suitable codec for 1.0 files is FFmpeg's H263 decoder, you can use it with the <CODE>-vc @@ -173,7 +173,7 @@ Win32 codecs.</P> -<H4><A NAME="mpeg">2.2.1.5 MPEG 1/2 video</A></H4> +<H4><A NAME="mpeg">2.2.1.5 MPEG 1/2 video</A></H4> <P>MPEG1 and MPEG2 are decoded by the multiplatform native <B>libmpeg2</B> library, whose source code is included in <B>MPlayer</B>. We handle buggy @@ -182,7 +182,7 @@ This recovery technique has no measurable speed penalty.</P> -<H4><A NAME="ms_video1">2.2.1.6 MS Video1</A></H4> +<H4><A NAME="ms_video1">2.2.1.6 MS Video1</A></H4> <P>This is a very old and very bad codec from Microsoft. In the past it was decoded with the <CODE>msvidc32.dll</CODE> Win32 codec, now we have our own @@ -190,14 +190,14 @@ Melanson</A>).</P> -<H4><A NAME="cinepak">2.2.1.7 Cinepak CVID</A></H4> +<H4><A NAME="cinepak">2.2.1.7 Cinepak CVID</A></H4> <P><B>MPlayer</B> uses its own open source, multiplatform Cinepak decoder by default. It supports YUV outputs, so that hardware scaling is possible if the video output driver permits it.</P> -<H4><A NAME="realvideo">2.2.1.8 RealVideo</A></H4> +<H4><A NAME="realvideo">2.2.1.8 RealVideo</A></H4> <B>MPlayer</B> supports decoding all versions of RealVideo: @@ -220,7 +220,7 @@ not allow this. You have to get them yourself.</P> -<H4><A NAME="xvid">2.2.1.9 XViD</A></H4> +<H4><A NAME="xvid">2.2.1.9 XViD</A></H4> <P><B>XViD</B> is a forked development of the OpenDivX codec. It happened when ProjectMayo changed OpenDivX to closed-source DivX4, and the non-ProjectMayo @@ -262,7 +262,7 @@ </OL> -<H4><A NAME="sorenson">2.2.1.10 Sorenson</A></H4> +<H4><A NAME="sorenson">2.2.1.10 Sorenson</A></H4> <P><B>Sorenson</B> is a video codec developed by Apple. We are currently able to decode the first version (SVQ1) with a native decoder.</P> @@ -282,7 +282,7 @@ <P>The Sorenson decoder is compiled and usable per default.</P> -<H3><A NAME="audio_codecs">2.2.2 Audio codecs</A></H3> +<H3><A NAME="audio_codecs">2.2.2 Audio codecs</A></H3> <P>The most important audio codecs above all:<BR></P> @@ -301,7 +301,7 @@ </UL> -<H4><A NAME="software_ac3">2.2.2.1 Software AC3 decoding</A></H4> +<H4><A NAME="software_ac3">2.2.2.1 Software AC3 decoding</A></H4> <P>This is the default decoder used for files with AC3 audio.</P> @@ -328,7 +328,7 @@ supposed to work).</P> -<H4><A NAME="hardware_ac3">2.2.2.2 Hardware AC3 decoding</A></H4> +<H4><A NAME="hardware_ac3">2.2.2.2 Hardware AC3 decoding</A></H4> <P>You need an AC3 capable sound card, with digital out (SP/DIF). The card's driver must properly support the AFMT_AC3 format (C-Media does). Connect @@ -338,7 +338,7 @@ decoder cards.</P> -<H4><A NAME="libmad">2.2.2.3 libmad support</A></H4> +<H4><A NAME="libmad">2.2.2.3 libmad support</A></H4> <P><A HREF="http://mad.sourceforge.net">libmad</A> is a multiplatform MPEG audio decoding library. It does not handle broken files well, and it @@ -348,7 +348,7 @@ option.</P> -<H4><A NAME="vivo_audio">2.2.2.4 VIVO audio</A></H4> +<H4><A NAME="vivo_audio">2.2.2.4 VIVO audio</A></H4> <P>The audio codec used in VIVO files depends on whether it is a VIVO/1.0 or VIVO/2.0 file. VIVO/1.0 files have <B>g.723</B> audio, and VIVO/2.0 files @@ -358,7 +358,7 @@ then copy it into the <CODE>/usr/lib/win32</CODE> directory.</P> -<H4><A NAME="realaudio">2.2.2.5 RealAudio</A></H4> +<H4><A NAME="realaudio">2.2.2.5 RealAudio</A></H4> <B>MPlayer</B> supports decoding nearly all versions of RealAudio: @@ -372,10 +372,10 @@ <A HREF="formats.html#real">RealMedia file format</A> section.</P> -<H3><A NAME="importing">2.2.3 Win32 codec importing HOWTO</A></H3> +<H3><A NAME="importing">2.2.3 Win32 codec importing HOWTO</A></H3> -<H4><A NAME="importing_vfw">2.2.3.1 VFW codecs</A></H4> +<H4><A NAME="importing_vfw">2.2.3.1 VFW codecs</A></H4> <P>VFW (Video for Windows) is the old Video API for Windows. Its codecs have the .DLL or (rarely) .DRV extension. @@ -406,7 +406,7 @@ <P><B>Note:</B> On Windows NT/2000/XP search for this info in the registry, e.g. search for "VIDC.HFYU". To find out how to do this, look at the old DirectShow method below.</P> -<H4><A NAME="importing_directshow">2.2.3.2 DirectShow codecs</A></H4> +<H4><A NAME="importing_directshow">2.2.3.2 DirectShow codecs</A></H4> <P>DirectShow is the newer Video API, which is even worse than its predecessor. Things are harder with DirectShow, since</P> @@ -420,14 +420,17 @@ <P><B>New Method:</B> Using Microsoft GraphEdit (fast)</P> <OL> - <LI>Get GraphEdit from either DirectX SDK or <A HREF="http://doom9.org">Doom9</A></LI> - <LI>Start <CODE>graphedit.exe</CODE></LI> - <LI>From the menue select Graph -> Insert Filters</LI> - <LI>Expand item <CODE>DirectShow Filters</CODE></LI> - <LI>Select the right codec name and expand item</LI> + <LI>Get GraphEdit from either DirectX SDK or + <A HREF="http://doom9.org">Doom9</A>.</LI> + <LI>Start <CODE>graphedit.exe</CODE>.</LI> + <LI>From the menu select Graph -> Insert Filters.</LI> + <LI>Expand item <CODE>DirectShow Filters</CODE>.</LI> + <LI>Select the right codec name and expand item.</LI> <LI>In the entry <CODE>DisplayName</CODE> look at the text in winged brackets - after the backslash and write it down (five dash-delimited blocks, the GUID)</LI> - <LI>The codec binary is the file specified in the <CODE>Filename</CODE> entry</LI> + after the backslash and write it down (five dash-delimited blocks, the + GUID).</LI> + <LI>The codec binary is the file specified in the <CODE>Filename</CODE> + entry.</LI> </OL> <P><B>Note:</B> If there is no <CODE>Filename</CODE> entry and <CODE>DisplayName</CODE> diff --git a/DOCS/documentation.html b/DOCS/documentation.html index 720ee4e626..71d4dac6a3 100644 --- a/DOCS/documentation.html +++ b/DOCS/documentation.html @@ -942,7 +942,7 @@ TV tuner</B>.</P> without tweaking/experimenting!</B></P> -<H3><A NAME="tv_compilation">2.5.1 Compilation</A></H3> +<H3><A NAME="tv_compilation">2.5.1 Compilation</A></H3> <OL> <LI>First, you have to recompile. <CODE>./configure</CODE> will autodetect @@ -962,7 +962,7 @@ TV tuner</B>.</P> </BLOCKQUOTE> -<H3><A NAME="tv_options">2.5.2 Available options</A></H3> +<H3><A NAME="tv_options">2.5.2 Available options</A></H3> <DL> <DT><CODE>on</CODE></DT> @@ -1011,7 +1011,7 @@ TV tuner</B>.</P> </DL> -<H3><A NAME="tv_keyboard">2.5.3 Keyboard control</A></H3> +<H3><A NAME="tv_keyboard">2.5.3 Keyboard control</A></H3> <TABLE BORDER=0> <TR><TD> </TD><TD>h / k</TD><TD> </TD><TD>select previous/next channel</TD></TR> @@ -1020,7 +1020,7 @@ TV tuner</B>.</P> </TABLE> -<H3><A NAME="tv_examples">2.5.4 Examples</A></H3> +<H3><A NAME="tv_examples">2.5.4 Examples</A></H3> <P>Dummy output, to AAlib :)<BR> <CODE> mplayer -tv on:driver=dummy:width=640:height=480 -vo aa</CODE><BR> diff --git a/DOCS/encoding.html b/DOCS/encoding.html index 292b7fa85f..68dafb3457 100644 --- a/DOCS/encoding.html +++ b/DOCS/encoding.html @@ -10,7 +10,7 @@ <BODY> -<H2><A NAME="encoding">2.4 Encoding with MEncoder</A></H2> +<H2><A NAME="encoding">2.4 Encoding with MEncoder</A></H2> <P><B>MEncoder</B> (<B>MPlayer</B>'s Movie Encoder) is a simple movie encoder, designed to encode MPlayer-playable movies @@ -21,7 +21,7 @@ for video manipulation.</P> -<H3><A NAME="compilation">2.4.1 Compilation</A></H3> +<H3><A NAME="compilation">2.4.1 Compilation</A></H3> <UL> <LI><B>OPTIONAL</B> - read <B>MPlayer</B>'s compilation instruction.</LI> @@ -44,8 +44,9 @@ quality by running <CODE>make test</CODE> after lame's compiling process is over. The resulting number should be less than <B>30</B>. Don't panic if it's <B>400</B> or so, you shouldn't heard any audible - quality decrease. Oh, and if your compiler doesn't even run <CODE>make test</CODE> ... - Well, delete that <B>GCC 2.96</B> or upgrade lame to at least <B>3.90</B>.</LI> + quality decrease. Oh, and if your compiler doesn't even run + <CODE>make test</CODE> ... Well, delete that <B>GCC 2.96</B> or upgrade + lame to at least <B>3.90</B>.</LI> <LI><B>OPTIONAL</B> - <CODE>libjpeg</CODE> and <CODE>libpng</CODE> - as described in the <A HREF="documentation.html#installation">Installation</A> section</LI> @@ -55,7 +56,7 @@ <I>avifile</I> library installed. <B>MEncoder</B> doesn't need it at all.</P> -<H3><A NAME="features">2.4.2 MEncoder features</A></H3> +<H3><A NAME="features">2.4.2 MEncoder features</A></H3> <UL> <LI>encoding from the wide range of fileformats and decoders of <B>MPlayer</B></LI> @@ -88,7 +89,7 @@ </UL> -<H4><A NAME="2pass">2.4.2.1 Encoding 2 or 3-pass DivX4</A></H4> +<H4><A NAME="2pass">2.4.2.1 Encoding 2 or 3-pass DivX4</A></H4> <P><U><B>2-pass encoding:</B></U> the name comes from the fact that this method encodes the file <I>twice</I>. The first encoding (dubbed <I>pass</I>) @@ -106,8 +107,8 @@ one)<BR> <CODE> mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 1<BR> - mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:more_options - -oac copy -o movie.avi -pass 2</CODE></P> + mencoder -dvd 2 -ovc lavc -lavcopts + vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 2</CODE></P> <P><U><B>3-pass encoding:</B></U> this is an extension of 2-pass encoding, where the audio encoding takes place in a separate pass. This method enables @@ -173,7 +174,7 @@ </UL> -<H4><A NAME="rescaling">2.4.2.2 Rescaling movies</A></H4> +<H4><A NAME="rescaling">2.4.2.2 Rescaling movies</A></H4> <P>Often the need to resize movie images' size emerges. Its reasons can be many, examples are decreasing output file size, encoding SVCDs to DivX. Ripped DVDs @@ -195,7 +196,7 @@ output.avi</CODE></P> -<H4><A NAME="copying">2.4.2.3 Stream copying</A></H4> +<H4><A NAME="copying">2.4.2.3 Stream copying</A></H4> <P><B>MEncoder</B> can handle input streams in two ways: <B>encode</B> or <B>copy</B> them. This section is about <B>copying</B>.</P> @@ -216,7 +217,7 @@ </UL> -<H4><A NAME="fixing">2.4.2.4 Fixing AVIs with broken index or interleaving</A></H4> +<H4><A NAME="fixing">2.4.2.4 Fixing AVIs with broken index or interleaving</A></H4> <P>Easiest thing. We simply copy the video and audio streams, and <B>MEncoder</B> generates the index. Of course this cannot fix possible bugs @@ -227,7 +228,7 @@ <P>Command: <CODE>mencoder -idx input.avi -ovc copy -oac copy -o output.avi</CODE></P> -<H4><A NAME="libavcodec">2.4.2.5 Encoding with the libavcodec codec family</A></H4> +<H4><A NAME="libavcodec">2.4.2.5 Encoding with the libavcodec codec family</A></H4> <P><A HREF="codecs.html#libavcodec">libavcodec</A> provides simple encoding to a lot of interesting video and audio formats (currently its audio codecs are @@ -252,7 +253,7 @@ -lavcopts vcodec=mjpeg -oac copy</CODE></P> -<H4><A NAME="image_files">2.4.2.6 Encoding from multiple input image files (JPEGs, PNGs or TGAs)</A></H4> +<H4><A NAME="image_files">2.4.2.6 Encoding from multiple input image files (JPEGs, PNGs or TGAs)</A></H4> <P><B>MEncoder</B> is capable of creating movies from one or more JPEG, PNG or TGA files. With simple framecopy it can create MJPEG (Motion JPEG), MPNG @@ -261,8 +262,8 @@ Explanation of the process: <OL> - <LI><B>MEncoder</B> <I>decodes</I> the input image(s) with <CODE>libjpeg</CODE> - (when decoding PNGs, it will use <B>libpng</B>).</LI> + <LI><B>MEncoder</B> <I>decodes</I> the input image(s) with + <CODE>libjpeg</CODE> (when decoding PNGs, it will use <B>libpng</B>).</LI> <LI><B>MEncoder</B> then feeds the decoded image to the chosen video compressor (DivX4, Xvid, ffmpeg msmpeg4, etc...). Watch for the PNG decoder, as @@ -276,31 +277,31 @@ Explanation of the process: global <A HREF="#options">Options</A> section and in the man page.</P> <P><I>Creating a DivX4 file from all the JPEG files in the current dir:</I><BR> - <CODE>mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 -oac copy -o - output.avi</CODE></P> + <CODE>mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 + -oac copy -o output.avi</CODE></P> <P><I>Creating a DivX4 file from some JPEG files in the current dir:</I><BR> - <CODE>mencoder frame001.jpg,frame002.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 -oac copy -o - output.avi</CODE></P> + <CODE>mencoder frame001.jpg,frame002.jpg -mf on:w=800:h=600:fps=25 + -ovc divx4 -oac copy -o output.avi</CODE></P> <P><I>Creating a Motion JPEG (MJPEG) file from all the JPEG files in the current dir:</I><BR> <CODE>mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc copy -oac copy -o output.avi</CODE></P> <P><I>Creating an uncompressed file from all the PNG files in the current dir:</I><BR> - <CODE>mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc raw -oac copy -o - output.avi</CODE></P> + <CODE>mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc raw + -oac copy -o output.avi</CODE></P> <P><I>Creating a Motion PNG (MPNG) file from all the PNG files in the current dir:</I><BR> - <CODE>mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc copy -oac copy - -o output.avi</CODE></P> + <CODE>mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc copy + -oac copy -o output.avi</CODE></P> <P><I>Creating a Motion TGA (MTGA) file from all the TGA files in the current dir:</I><BR> - <CODE>mencoder \*.tga -mf on:w=800:h=600:fps=25:type=tga -ovc copy -oac copy - -o output.avi</CODE></P> + <CODE>mencoder \*.tga -mf on:w=800:h=600:fps=25:type=tga -ovc copy + -oac copy -o output.avi</CODE></P> -<H4><A NAME="vobsub">2.4.2.7 Extracting DVD subtitles to Vobsub file</A></H4> +<H4><A NAME="vobsub">2.4.2.7 Extracting DVD subtitles to Vobsub file</A></H4> <P><B>MEncoder</B> is capable of extracting subtitles from a DVD into Vobsub fomat files. They consist of a pair of files ending in @@ -343,8 +344,8 @@ Explanation of the process: <H3><A NAME="options">2.4.3 Available options</A></H3> -<P>For the complete list of available <B>MEncoder</B> options and examples, please - see the man page.</P> +<P>For the complete list of available <B>MEncoder</B> options and examples, + please see the man page.</P> </BODY> </HTML> diff --git a/DOCS/video.html b/DOCS/video.html index 432688eda5..e289a439fa 100644 --- a/DOCS/video.html +++ b/DOCS/video.html @@ -13,7 +13,7 @@ <H3><A NAME="video">2.3.1 Video output devices</A></H3> -<H4><A NAME="mtrr">2.3.1.1 Setting up MTRR</A></H4> +<H4><A NAME="mtrr">2.3.1.1 Setting up MTRR</A></H4> <P>It is VERY recommended to check if the MTRR registers are set up properly, because they can give a big performance boost.</P> @@ -710,7 +710,7 @@ for further tuning issues.</P> -<H4><A NAME="vesa">2.3.1.11 VESA - output to VESA BIOS</A></H4> +<H4><A NAME="vesa">2.3.1.11 VESA - output to VESA BIOS</A></H4> <P>This driver was designed and introduced as a <B>generic driver</B> for any video card which has VESA VBE 2.0+ compatible BIOS. Another advantage of this @@ -806,7 +806,7 @@ </UL> -<H4><A NAME="x11">2.3.1.12 X11</A></H4> +<H4><A NAME="x11">2.3.1.12 X11</A></H4> <P>Avoid if possible. Outputs to X11 (uses shared memory extension), with no hardware acceleration at all. Supports (MMX/3DNow/SSE accelerated, but still |