From ec0bb2e24c54162dabc11c1f1d9fe6764786fde8 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 10 Oct 2002 01:42:27 +0000 Subject: [PATCH] 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 --- DOCS/codecs.html | 53 ++++++++++++++++++++------------------ DOCS/documentation.html | 8 +++--- DOCS/encoding.html | 57 +++++++++++++++++++++-------------------- 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 @@ -

2.2 Supported codecs

+

2.2 Supported codecs

2.2.1 Video codecs

@@ -130,7 +130,7 @@ movies without dropped frames on my K6/2 500.

-

2.2.1.3 XAnim codecs

+

2.2.1.3 XAnim codecs

Foreword:
Be advised that the XAnim binary codecs are packaged with a piece of text @@ -163,7 +163,7 @@ 3ivX, h263.

-

2.2.1.4 VIVO video

+

2.2.1.4 VIVO video

MPlayer 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 -vc @@ -173,7 +173,7 @@ Win32 codecs.

-

2.2.1.5 MPEG 1/2 video

+

2.2.1.5 MPEG 1/2 video

MPEG1 and MPEG2 are decoded by the multiplatform native libmpeg2 library, whose source code is included in MPlayer. We handle buggy @@ -182,7 +182,7 @@ This recovery technique has no measurable speed penalty.

-

2.2.1.6 MS Video1

+

2.2.1.6 MS Video1

This is a very old and very bad codec from Microsoft. In the past it was decoded with the msvidc32.dll Win32 codec, now we have our own @@ -190,14 +190,14 @@ Melanson).

-

2.2.1.7 Cinepak CVID

+

2.2.1.7 Cinepak CVID

MPlayer 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.

-

2.2.1.8 RealVideo

+

2.2.1.8 RealVideo

MPlayer supports decoding all versions of RealVideo: @@ -220,7 +220,7 @@ not allow this. You have to get them yourself.

-

2.2.1.9 XViD

+

2.2.1.9 XViD

XViD 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 @@ -

2.2.1.10 Sorenson

+

2.2.1.10 Sorenson

Sorenson is a video codec developed by Apple. We are currently able to decode the first version (SVQ1) with a native decoder.

@@ -282,7 +282,7 @@

The Sorenson decoder is compiled and usable per default.

-

2.2.2 Audio codecs

+

2.2.2 Audio codecs

The most important audio codecs above all:

@@ -301,7 +301,7 @@ -

2.2.2.1 Software AC3 decoding

+

2.2.2.1 Software AC3 decoding

This is the default decoder used for files with AC3 audio.

@@ -328,7 +328,7 @@ supposed to work).

-

2.2.2.2 Hardware AC3 decoding

+

2.2.2.2 Hardware AC3 decoding

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.

-

2.2.2.3 libmad support

+

2.2.2.3 libmad support

libmad is a multiplatform MPEG audio decoding library. It does not handle broken files well, and it @@ -348,7 +348,7 @@ option.

-

2.2.2.4 VIVO audio

+

2.2.2.4 VIVO audio

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 g.723 audio, and VIVO/2.0 files @@ -358,7 +358,7 @@ then copy it into the /usr/lib/win32 directory.

-

2.2.2.5 RealAudio

+

2.2.2.5 RealAudio

MPlayer supports decoding nearly all versions of RealAudio: @@ -372,10 +372,10 @@ RealMedia file format section.

-

2.2.3 Win32 codec importing HOWTO

+

2.2.3 Win32 codec importing HOWTO

-

2.2.3.1 VFW codecs

+

2.2.3.1 VFW codecs

VFW (Video for Windows) is the old Video API for Windows. Its codecs have the .DLL or (rarely) .DRV extension. @@ -406,7 +406,7 @@

Note: 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.

-

2.2.3.2 DirectShow codecs

+

2.2.3.2 DirectShow codecs

DirectShow is the newer Video API, which is even worse than its predecessor. Things are harder with DirectShow, since

@@ -420,14 +420,17 @@

New Method: Using Microsoft GraphEdit (fast)

    -
  1. Get GraphEdit from either DirectX SDK or Doom9
    2. -
  2. Start graphedit.exe
    3. -
  3. From the menue select Graph -> Insert Filters
    4. -
  4. Expand item DirectShow Filters
    5. -
  5. Select the right codec name and expand item
    6. +
  6. Get GraphEdit from either DirectX SDK or + Doom9.
    7. +
  7. Start graphedit.exe.
    8. +
  8. From the menu select Graph -> Insert Filters.
    9. +
  9. Expand item DirectShow Filters.
    10. +
  10. Select the right codec name and expand item.
  11. In the entry DisplayName look at the text in winged brackets - after the backslash and write it down (five dash-delimited blocks, the GUID)
    12. -
  12. The codec binary is the file specified in the Filename entry
    13. + after the backslash and write it down (five dash-delimited blocks, the + GUID). +
  13. The codec binary is the file specified in the Filename + entry.

Note: If there is no Filename entry and DisplayName 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.

without tweaking/experimenting!

-

2.5.1 Compilation

+

2.5.1 Compilation

  1. First, you have to recompile. ./configure will autodetect @@ -962,7 +962,7 @@ TV tuner.

    -

    2.5.2 Available options

    +

    2.5.2 Available options

    on
    @@ -1011,7 +1011,7 @@ TV tuner.

    -

    2.5.3 Keyboard control

    +

    2.5.3 Keyboard control

    @@ -1020,7 +1020,7 @@ TV tuner.

      h / k  select previous/next channel
    -

    2.5.4 Examples

    +

    2.5.4 Examples

    Dummy output, to AAlib :)
        mplayer -tv on:driver=dummy:width=640:height=480 -vo aa
    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 @@ -

    2.4 Encoding with MEncoder

    +

    2.4 Encoding with MEncoder

    MEncoder (MPlayer's Movie Encoder) is a simple movie encoder, designed to encode MPlayer-playable movies @@ -21,7 +21,7 @@ for video manipulation.

    -

    2.4.1 Compilation

    +

    2.4.1 Compilation

    • OPTIONAL - read MPlayer's compilation instruction.
      • @@ -44,8 +44,9 @@ quality by running make test after lame's compiling process is over. The resulting number should be less than 30. Don't panic if it's 400 or so, you shouldn't heard any audible - quality decrease. Oh, and if your compiler doesn't even run make test ... - Well, delete that GCC 2.96 or upgrade lame to at least 3.90. + quality decrease. Oh, and if your compiler doesn't even run + make test ... Well, delete that GCC 2.96 or upgrade + lame to at least 3.90.
    • OPTIONAL - libjpeg and libpng - as described in the Installation section
      • @@ -55,7 +56,7 @@ avifile library installed. MEncoder doesn't need it at all.

      -

      2.4.2 MEncoder features

      +

      2.4.2 MEncoder features

      • encoding from the wide range of fileformats and decoders of MPlayer
        • @@ -88,7 +89,7 @@
      -

      2.4.2.1 Encoding 2 or 3-pass DivX4

      +

      2.4.2.1 Encoding 2 or 3-pass DivX4

      2-pass encoding: the name comes from the fact that this method encodes the file twice. The first encoding (dubbed pass) @@ -106,8 +107,8 @@ one)
          mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 1
      -     mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:more_options - -oac copy -o movie.avi -pass 2

      +     mencoder -dvd 2 -ovc lavc -lavcopts + vcodec=mpeg4:more_options -oac copy -o movie.avi -pass 2

      3-pass encoding: 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 @@

    -

    2.4.2.2 Rescaling movies

    +

    2.4.2.2 Rescaling movies

    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

    -

    2.4.2.3 Stream copying

    +

    2.4.2.3 Stream copying

    MEncoder can handle input streams in two ways: encode or copy them. This section is about copying.

    @@ -216,7 +217,7 @@ -

    2.4.2.4 Fixing AVIs with broken index or interleaving

    +

    2.4.2.4 Fixing AVIs with broken index or interleaving

    Easiest thing. We simply copy the video and audio streams, and MEncoder generates the index. Of course this cannot fix possible bugs @@ -227,7 +228,7 @@

    Command: mencoder -idx input.avi -ovc copy -oac copy -o output.avi

    -

    2.4.2.5 Encoding with the libavcodec codec family

    +

    2.4.2.5 Encoding with the libavcodec codec family

    libavcodec 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

    -

    2.4.2.6 Encoding from multiple input image files (JPEGs, PNGs or TGAs)

    +

    2.4.2.6 Encoding from multiple input image files (JPEGs, PNGs or TGAs)

    MEncoder 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:

      -
    1. MEncoder decodes the input image(s) with libjpeg - (when decoding PNGs, it will use libpng).
      2. +
    2. MEncoder decodes the input image(s) with + libjpeg (when decoding PNGs, it will use libpng).
    3. MEncoder 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 Options section and in the man page.

      Creating a DivX4 file from all the JPEG files in the current dir:
      -   mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 -oac copy -o - output.avi

      +   mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 + -oac copy -o output.avi

      Creating a DivX4 file from some JPEG files in the current dir:
      -   mencoder frame001.jpg,frame002.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 -oac copy -o - output.avi

      +   mencoder frame001.jpg,frame002.jpg -mf on:w=800:h=600:fps=25 + -ovc divx4 -oac copy -o output.avi

      Creating a Motion JPEG (MJPEG) file from all the JPEG files in the current dir:
        mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc copy -oac copy -o output.avi

      Creating an uncompressed file from all the PNG files in the current dir:
      -   mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc raw -oac copy -o - output.avi

      +   mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc raw + -oac copy -o output.avi

      Creating a Motion PNG (MPNG) file from all the PNG files in the current dir:
      -   mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc copy -oac copy - -o output.avi

      +   mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc copy + -oac copy -o output.avi

      Creating a Motion TGA (MTGA) file from all the TGA files in the current dir:
      -   mencoder \*.tga -mf on:w=800:h=600:fps=25:type=tga -ovc copy -oac copy - -o output.avi

      +   mencoder \*.tga -mf on:w=800:h=600:fps=25:type=tga -ovc copy + -oac copy -o output.avi

      -

      2.4.2.7 Extracting DVD subtitles to Vobsub file

      +

      2.4.2.7 Extracting DVD subtitles to Vobsub file

      MEncoder 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:

      2.4.3 Available options

      -

      For the complete list of available MEncoder options and examples, please - see the man page.

      +

      For the complete list of available MEncoder options and examples, + please see the man page.

      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 @@

      2.3.1 Video output devices

      -

      2.3.1.1 Setting up MTRR

      +

      2.3.1.1 Setting up MTRR

      It is VERY recommended to check if the MTRR registers are set up properly, because they can give a big performance boost.

      @@ -710,7 +710,7 @@ for further tuning issues.

      -

      2.3.1.11 VESA - output to VESA BIOS

      +

      2.3.1.11 VESA - output to VESA BIOS

      This driver was designed and introduced as a generic driver for any video card which has VESA VBE 2.0+ compatible BIOS. Another advantage of this @@ -806,7 +806,7 @@ -

      2.3.1.12 X11

      +

      2.3.1.12 X11

      Avoid if possible. Outputs to X11 (uses shared memory extension), with no hardware acceleration at all. Supports (MMX/3DNow/SSE accelerated, but still