From 4617c88ba90f03a1e1325c9450b8d012b81a26c0 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 23 Aug 2002 10:50:19 +0000 Subject: Applied patch by Andras Mohari , slightly modified. * Fixed <> chars (or replaced them with something else, where it was trivial). * weblint complained about here being a bad form, so I replaced them with more descriptive text. * Fixed empty tags. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7077 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/cd-dvd.html | 4 ++-- DOCS/codecs.html | 10 ++++----- DOCS/documentation.html | 43 +++++++++++++++++++------------------- DOCS/faq.html | 14 ++++++------- DOCS/sound.html | 4 ++-- DOCS/users_against_developers.html | 8 +++---- DOCS/video.html | 14 ++++++------- 7 files changed, 49 insertions(+), 48 deletions(-) diff --git a/DOCS/cd-dvd.html b/DOCS/cd-dvd.html index e2bdc75247..560584ae83 100644 --- a/DOCS/cd-dvd.html +++ b/DOCS/cd-dvd.html @@ -35,11 +35,11 @@

You can also try

-

    echo current_speed:4 >/proc/ide/[cdrom device]/settings

+

    echo current_speed:4 > /proc/ide/[cdrom device]/settings

but you will need root privileges. The following command may also help:

-

    echo file_readahead:2000000 >/proc/ide/[cdrom device]/settings

+

    echo file_readahead:2000000 > /proc/ide/[cdrom device]/settings

This sets prefetched file reading to 2MB, which helps with scratched CD-ROMs. It is recommended that you also tune your CD-ROM drive with hdparm:

diff --git a/DOCS/codecs.html b/DOCS/codecs.html index 3eaf9e6cc0..3146a82bfd 100644 --- a/DOCS/codecs.html +++ b/DOCS/codecs.html @@ -167,9 +167,9 @@

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 ffh263 option (default) (requires up-to-date libavcodec). For 2.0 - files, use the ivvideo.dll Win32 DLL file (from - here), - and install it under /usr/lib/win32 or wherever you store the + files, use the + ivvideo.dll + Win32 DLL file, and install it under /usr/lib/win32 or wherever you store the Win32 codecs. This latter codec does not support YV12 nor YUY2 only BGR modes, restricting it to the X11 and OpenGL outputs. Hopefully ffh263 will support VIVO 2.0 files in the future.

@@ -358,8 +358,8 @@

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 have Vivo Siren audio. Both are supported. You can grab the - g.723/Siren Win32 DLL from - here, + g.723/Siren + Win32 DLL from the MPlayer site, then copy it into the /usr/lib/win32 directory.

diff --git a/DOCS/documentation.html b/DOCS/documentation.html index 3afee45c09..87f8cbdfb3 100644 --- a/DOCS/documentation.html +++ b/DOCS/documentation.html @@ -11,8 +11,7 @@

MPlayer - The Movie Player for LINUX

-

- © 2000-2002 Arpad Gereoffy (A'rpi/ESP-team)
+

© 2000-2002 Arpad Gereoffy (A'rpi/ESP-team)
http://www.mplayerhq.hu

[ English ] @@ -436,9 +435,9 @@ Developer Cries need it) or don't up/downgrade at all (but in this case, be prepared for runtime problems). If you vote for 3.x.x, try to use the latest version, early releases had various bugs, so be sure you use at least 3.1, it's - tested and working. Detailed information about gcc 2.96's bugs (that are - still NOT fixed, they have been WORKED AROUND in MPlayer!) can be - found here and in the + tested and working. For detailed information about gcc 2.96's bugs (that are + still NOT fixed, they have been WORKED AROUND in MPlayer!), see the + gcc 2.96 section and the FAQ.

  • XFree86 - suggested version is always the newest (4.2.0). Normally, everyone wants this, as starting with XFree86 4.0.2, it contains @@ -469,7 +468,8 @@ Developer Cries
  • libavcodec: This codec package is capable of decoding H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1 encoded video streams, on multiple platforms. It is also known to be the fastest for this task. - Details can be found here. Features:
    + See the libavcodec section for details. + Features:
    • gain decoding of videos mentioned above, on non-x86 machines
    • encoding with most of the mentioned codecs
      • @@ -692,8 +692,9 @@ Developer Cries

      Debian users can build a .deb package for themselves, it's very simple. Just exec fakeroot debian/rules binary in - MPlayer's root directory. Detailed instructions can be found - here.

      + MPlayer's root directory. See + Debian packaging for detailed + instructions.

      Always browse the output of ./configure, and the configure.log file, they contain information about what will be @@ -899,7 +900,7 @@ There are three timing methods in MPlayer. RTC frequency for normal users through the /proc filesystem. Use this command to enable RTC for normal users:

      - echo 1024 > /proc/sys/dev/rtc/max-user-freq + echo 1024 > /proc/sys/dev/rtc/max-user-freq

      If you do not have such a new kernel, you can also change one line in drivers/char/rtc.c and recompile your kernel. Find the @@ -908,7 +909,7 @@ There are three timing methods in MPlayer. * We don't really want Joe User enabling more * than 64Hz of interrupts on a multi-user machine. */ - if ((rtc_freq > 64) && (!capable(CAP_SYS_RESOURCE))) + if ((rtc_freq > 64) && (!capable(CAP_SYS_RESOURCE))) and change the 64 to 1024. You should really know what you are doing, though.
      @@ -1111,7 +1112,7 @@ TV tuner.

      This sets up a filter pipeline (you can use any number of filters). Their parameters are optional and if omitted, some of them are set to default values, e.g. x and y are both set to the center of - the screen and width and height> will be set to + the screen and width and height will be set to the width and height of the movie.

      Filters are queued starting from libvo, so filter1 will be the @@ -1423,8 +1424,8 @@ LEFT seek -10 - audio_delay 0.100 + audio_delay -0.100 q quit -> pt_step 1 -< pt_step -1 +> pt_step 1 +< pt_step -1 ENTER pt_step 1 1 @@ -1517,7 +1518,7 @@ ENTER pt_step 1 1

      Adjust the subtitles delay of +/- val seconds or set it to val seconds when abs is non zero.

    • osd [(int) level=-1] -

      Toggle osd mode or set it to level when level > 0.

      • +

      Toggle osd mode or set it to level when level > 0.

    • volume (int) dir

      Increase/decrease volume

    • contrast (int) val [(int) abs=0]
      • @@ -1627,11 +1628,11 @@ end -

      4. FAQ section

      +

      4. FAQ section

      -

      5. CD/DVD section

      +

      5. CD/DVD section

      @@ -1759,7 +1760,7 @@ end
      • The sd(7D) driver on Solaris 8 x86 driver has bug when accessing a disk - block >4GB on a device using a logical blocksize != DEV_BSIZE (i.e. CD-ROM + block >4GB on a device using a logical blocksize != DEV_BSIZE (i.e. CD-ROM and DVD media). Due to a 32Bit int overflow, a disk address modulo 4GB is accessed. (http://groups.yahoo.com/group/solarisonintel/message/22516) @@ -1987,7 +1988,7 @@ end
      • Jens Hoffmann
        • Additional YUV formats support
          • -
        • found the big BITMAPINFOHEADER problem -> solved ASV2 pixelization
          • +
        • found the big BITMAPINFOHEADER problem -> solved ASV2 pixelization
      • Nick Kurshev @@ -2509,12 +2510,12 @@ end

        Note: Unless explicitly stated otherwise the language of the above lists is English. Please do not send messages in other languages!

        -

        Note: You can reach the searchable mailing list archives - here. +

        Note: You can reach the searchable mailing list archives at + http://www.mplayerhq.hu/cgi-bin/htsearch. -

        Appendix C - How to report bugs

        +

        Appendix C - How to report bugs

        diff --git a/DOCS/faq.html b/DOCS/faq.html index fd3b08f435..ace71d498e 100644 --- a/DOCS/faq.html +++ b/DOCS/faq.html @@ -42,8 +42,8 @@
        A: This is a known problem of gcc 3.0.4, upgrade to 3.1 to solve the - problem. How to install gcc is described - here.
        + problem. How to install gcc is described in the + gcc 2.96 section.
         
        Q: Configure ends with this text, and MPlayer won't compile!
        @@ -378,7 +378,7 @@
        A: Probably the audio uses a codec not natively supported by MPlayer. Install the Win32 codec package as described in the README - or here.
        + or in the Installation section.
         
        Q: ... works with avifile/aviplay but doesn't with MPlayer.
        @@ -397,9 +397,9 @@
        Q: MPlayer exits with some error when using l3codeca.acm.
        A: Check ldd /usr/local/bin/mplayer output. If it contains
        -     libc.so.6 => /lib/libc.so.6 (0x4???????)
        +     libc.so.6 => /lib/libc.so.6 (0x4???????)
        where "?" is any number then it's OK, the error is not here. If it is:
        -     libc.so.6 => /lib/libc.so.6 (0x00??????)
        +     libc.so.6 => /lib/libc.so.6 (0x00??????)
        then there is a problem with your kernel/libc. Maybe you are using some security patches (for example Solar Designer's OpenWall patch) which forces loading libraries to very low addresses. @@ -530,7 +530,7 @@ 
             AO: [oss] 44100Hz 2ch Signed 16-bit (Little-Endian)
     audio_setup: Can't open audio device /dev/dsp: Device or resource busy
-    couldn't open/init audio device -> NOSOUND
+    couldn't open/init audio device -> NOSOUND
     Audio: no sound!!!
     Start playing...
        @@ -629,7 +629,7 @@
        Q: While playing a DVD, I encountered this error:
        mplayer: ifo_read.c:1143: ifoRead_C_ADT_internal: Assertion - nfo_length / sizeof(cell_adr_t) >= c_adt->nr_of_vobs' failed.
        + nfo_length / sizeof(cell_adr_t) >= c_adt->nr_of_vobs' failed.
        A: This is a known libdvdread 0.9.1/0.9.2 bug. Use libmpdvdkit, which is present in MPlayer source, and used by default.
         
        diff --git a/DOCS/sound.html b/DOCS/sound.html index 462508ce1c..66be60f359 100644 --- a/DOCS/sound.html +++ b/DOCS/sound.html @@ -54,7 +54,7 @@ - + @@ -62,7 +62,7 @@ - diff --git a/DOCS/users_against_developers.html b/DOCS/users_against_developers.html index 4a6e7bf518..558a8ab34a 100644 --- a/DOCS/users_against_developers.html +++ b/DOCS/users_against_developers.html @@ -49,7 +49,7 @@ bugs, especially since some workarounds may imply a performance penalty.

        You can read about the other side of the story - here. + at this site. GCC 2.96 does not allow | (pipe) characters in assembler comments because it supports Intel as well as AT&T Syntax and the | character is a symbol in the Intel variant. The problem is that it silently ignores the @@ -67,9 +67,9 @@

        If you have problems with GCC 2.96, you can get 2.96-85 packages from the Red Hat ftp server, or just go for the - 3.0.4 packages offered for version 7.2 and later. You can also get gcc-3.1 - packages (unofficial, but working fine) - here and you can + 3.0.4 packages offered for version 7.2 and later. You can also get + gcc-3.1 packages + (unofficial, but working fine) and you can install them along the gcc-2.96 you already have. MPlayer will detect it and use 3.1 instead of 2.96. If you do not want to or cannot use the binary packages, here is how you can compile GCC 3.1 from source:

        diff --git a/DOCS/video.html b/DOCS/video.html index b0a72561ca..cfb6e9c91a 100644 --- a/DOCS/video.html +++ b/DOCS/video.html @@ -150,7 +150,7 @@ xv support, but the card itself is very slow, so you better sell it.

        NOTE: Savage cards have a slow YV12 image displaying capability (it - needs to do YV12->YUY2 conversion, because the Savage hardware can't display + needs to do YV12 to YUY2 conversion, because the Savage hardware can't display YV12). So when this documentation says at some point "this has YV12 output use this, it's faster", it's not sure. Try this @@ -619,12 +619,12 @@

        The /dev/mga_vid device file can be read (for example by cat /dev/mga_vid) for some info, and written for brightness - change: echo "brightness=120" > /dev/mga_vid

        + change: echo "brightness=120" > /dev/mga_vid

        2.3.1.8 SiS 6326 framebuffer (sis_vid)

        -

        SiS 6326 YUV Framebuffer driver -> sis_vid kernel driver

        +

        SiS 6326 YUV Framebuffer driver -> sis_vid kernel driver

        Its interface should be compatible with the mga_vid, but the driver was not updated after the mga_vid changes, so it's outdated now. Volunteers @@ -650,8 +650,8 @@ http://utah-glx.sourceforge.net for details about how to install it.

        -

        XFree86(DRI) >= 4.0.3 supports OpenGL with Matrox and Radeon cards, >= 4.2 - supports Rage128. See +

        XFree86(DRI) 4.0.3 or later supports OpenGL with Matrox and Radeon cards, + 4.2.0 or later supports Rage128. See http://dri.sourceforge.net for download and installation instructions.

        @@ -783,7 +783,7 @@ driver from text-mode then after terminating MPlayer you will have ROM font loaded instead of national. You can load national font again by using setsysfont utility from the Mandrake distribution - for example.
        + for example.
        (Hint: The same utility is used for the localization of fbdev).
      • Some Linux graphics drivers don't update active BIOS mode in DOS memory. So if you have such problem - always use VESA driver only from @@ -1065,7 +1065,7 @@ Some remarks: expand=w:h:x:y:1 (the 5th parameter :1 at the end will enable OSD rendering). You may want to move the image up a bit to get a bigger black zone for subtitles. You may also want to move subtitles up, if - they are outside your TV screen, use the -subpos <0-100> switch + they are outside your TV screen, use the -subpos <0-100> switch to adjust this (-subpos 80 is a good choice).

        In order to play non-25fps movies on a PAL TV or with a slow CPU, add the -- cgit v1.2.3

        • VIA onboard chipset (via82cxxx) 48kHz only
        Driver: from here
        Driver: from sourceforge.net
        Aureal Vortex 2
            OSS:no driver
        ALSA:no driver
        Max kHz:48
        Driver:aureal.sourceforge.net
        Driver2: from here
        +
        Driver2: from Pontscho's page
        (buffer size increased to 32k)
        GUS PnP