From 837858d63f4cbcd8eebb347aec61e56a3ca8c123 Mon Sep 17 00:00:00 2001
From: arpi
Date: Sat, 8 Sep 2001 05:07:21 +0000
Subject: [PATCH] small fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1870 b3059339-0415-0410-9bf9-f77b7e298cf2
---
DOCS/codecs.html | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/DOCS/codecs.html b/DOCS/codecs.html
index 8de2ddd37a..b65ed29c6e 100644
--- a/DOCS/codecs.html
+++ b/DOCS/codecs.html
@@ -14,8 +14,8 @@
MPEG 1/2 System Stream (PS/PES/VOB) and Elementary Stream (ES) file
formats
RIFF AVI file format
- ASF 1.0 file format
- supports reading from file, stdin, DVD drive or network via HTTP
+ ASF/WMV 1.0 file format
+ supports reading from file, stdin, or network via HTTP
Note: about quicktime (.mov/.qt) and realmedia (.ra/.rm) support read the FAQ!
@@ -24,24 +24,24 @@
2.1.2. Supported audio & video codecs
See http://www.mplayerhq.hu/DOCS/codecs-status.html for the complete,
-daily updated list!!!
+daily generated list!!!
The most important video codecs:
- MPEG1 (VCD) and MPEG2 (DVD) video
-
- DivX, FFmpeg, OpenDivX and other MPEG4 variants
-
- Windows Media Video 7 (WMV1) and Windows Media Video 8 used in .wmv files
+
- DivX ;-), OpenDivX (DivX4) and other MPEG4 variants
+
- Windows Media Video 7 (WMV1) and 8 (WMV2) used in .wmv files
- Intel Indeo codecs (3.1,3.2,4.1,5.0)
- MJPEG, ASV2 and other hardware formats
The most important audio codecs:
-- MPEG layer 2, and layer 3 (MP3) audio (native code, with 3dnow optimization)
-
- AC3 dolby audio (native code, with 3dnow optimization)
-
- Voxware audio
+
- MPEG layer 2, and layer 3 (MP3) audio (native code, with mmx/sse/3dnow optimization)
+
- AC3 dolby audio (native code, with sse/3dnow optimization)
+
- Ogg Vorbis audio codec (native lib)
+
- Voxware audio (using directshow DLL)
- alaw, msgsm, pcm and other simple old audio formats
-
- Ogg Vorbis audio codec
If you have a codec not listed here, and not supported yet, just read
ldconfig
cp decore.h /usr/local/include/
+Note: do NOT forget to add /usr/local/lib to your /etc/ld.so.conf !
MPlayer autodetects if DivX4 is (properly) installed, just compile
as usual. If it doesn't detect it, you didn't install it exactly as above,
@@ -135,7 +136,7 @@ like this:
main/libavcodec
-Symlinking is NOT enough, you have to copy it.
+Symlinking is NOT enough, you have to copy/move it!!!
./configure detects if it can be built. At the moment it doesn't support
postprocessing, and is under optimization (it's faster than the DS/VfW DivX
@@ -183,7 +184,7 @@ with the MSACM prefix:
So, now we have all the info needed (fourcc, codec file, sample AVI), submit
your codec support request in mail, and upload these files to the FTP:
- ftp://mplayerhq.hu/MPlayer/incoming/[codecname]/
+ ftp://ftp.mplayerhq.hu/MPlayer/incoming/[codecname]/
2.1.4.2. DirectShow codecs
@@ -219,7 +220,7 @@ false hits, but maybe you'll have the right, too...
So, now we have all the info needed (fourcc, GUID, codec file, sample AVI),
submit your codec support request in mail, and upload these files to the FTP:
-ftp://mplayerhq.hu/MPlayer/incoming/[codecname]/
+ftp://ftp.mplayerhq.hu/MPlayer/incoming/[codecname]/