summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/BUGS2
-rw-r--r--DOCS/CODECS114
-rw-r--r--DOCS/MPlayer-FAQ2
-rw-r--r--DOCS/README10
4 files changed, 8 insertions, 120 deletions
diff --git a/DOCS/BUGS b/DOCS/BUGS
index 73efbdd480..52944a1764 100644
--- a/DOCS/BUGS
+++ b/DOCS/BUGS
@@ -56,7 +56,7 @@ Signal 11 in decode_audio:
No sound at all:
- your file uses an unsupported codec
- Workaround: read DOCS/CODECS, and help us adding support for it
+ Workaround: read DOCS/codecs.conf, and help us adding support for it
Video-out problems:
~~~~~~~~~~~~~~~~~~~
diff --git a/DOCS/CODECS b/DOCS/CODECS
index c73e70f79b..5f915588ce 100644
--- a/DOCS/CODECS
+++ b/DOCS/CODECS
@@ -2,119 +2,7 @@
Status of codecs support:
=========================
-If you have sample files for untested codecs, or want a new codec to be
-added, contact us! See bellow (after the codecs listing) the details!
-
-Video codecs:
-~~~~~~~~~~~~~
-Built-in native codecs:
-
-- MPEG 1/2 (no fourcc)
- libmpeg2: works, YUV (YV12) supported, with optional postprocessing!!!
-- OpenDivX (DIV1,DIVX)
- decore: works, YUV (YV12) supported, postprocessing supported
-
-Fully functional Win32 VfW/DShow codecs:
-
-- M$ MPEG4 v1, v2 (MPG4,MP42):
- mpg4c32.dll: works, YUV supported.
-- M$ MPEG4 v3 / DivX ;-) / AngelPotion (MP43,DIV3,DIV4,DIV5,DIV6,AP41)
- divxc32.dll: works, YUV supported.
- divx_c32.ax: works, YUV and postprocessing supported.
-- Indeo Video 5.0: (IV50)
- ir50_32.dll (VfW): works, YUV supported.
- ir50_32.dll (DShow): works, YUV supported.
-- Cinepak Video: (CVID)
- iccvid.dll: works, YUV supported.
-- Microsoft Video v1.0 (CRAM)
- msvidc32.dll: works, no YUV
-- ATI VCR-2: (VCR2)
- ativcr2.dll: works, YUV supported
-- Motion JPEG (MJPG)
- m3jpeg32.dll: can't load (segfault)
- mcmjpg32.dll: works, YUV supported
- m3jpegdec.ax: works, YUV supported
-- Windows Media Video 7 (WMV1)
- wmvds32.ax: works, YUV supported
-- I263: (I263)
- i263_32.drv: works, YUV supported
-- DV - Sony Digital Video (dvsd)
- ?
-- ASUS ASV2: (ASV2)
- asusasv2.dll: works, image upside-down on RGB (YUV ok!)
-
-Problems:
-
-- Indeo Video 4.1: (IV41)
- ir41_32.dll: works, no YUV, image upside-down
-- Indeo Video 3.2: (IV32, IV31)
- ir32_32.dll: works, no YUV, image upside-down
-- ATI VCR1: (VCR1)
- ativcr1.dll: can't load (16-bit DLL)
-- TrueMotion 2.0: (TM20)
- tm20dec.ax: dest format not accepted
-- ZLIB
- avizlib.dll: YUY2 only (no RGB), Called unk_RegEnumValueA -> endless loop
-- MSZH
- avimszh.dll: RGB only (no YUV), Called unk_RegEnumValueA -> endless loop
-- MWV1: calls many unk_ functions and then segfaults.
-- HuffYUV: (HFYU)
- huffyuv.dll: YUY2 _or_ 24/32bpp only (depending on file encoding)
-
-Not tested:
-
-- ASUS ASV1: (ASV1)
- asusasvd.dll: ??? not tested
-- Motion Wavelets: (MWV1)
- icmw_32.dll: not tested (no sample file)
-- Windows Media Video 8 (WMV2)
- wmv8ds32.ax: not tested (no sample file)
-- I420: (I420)
- i263_32.drv: not tested, but should work (no sample file)
-- m261: (m261)
- msh261.drv: not tested, what's this?
-
-Audio codecs:
-~~~~~~~~~~~~~
-Built-in native codecs:
-
-- Uncompressed PCM (0)
-- Uncompressed DVD PCM: (0x10001)
-- MPEG layer 2 and 3: (0x50, 0x55)
- mp3lib, based on mpg123 (sometimes segfaults, then use ACM, see below)
-- AC3: (0x2000)
- libac3
-- aLaw audio: (0x6)
- aLaw codec from xanim sources
-- MS-GSM: (0x31,0x32)
- xa_gsm from avifile sources
-
-Fully functional Win32 ACM/DShow codecs:
-
-- Windows Media Audio / DivX audio (0x160, 0x161)
- divxa32.acm: works
-- MS ADPCM (0x2)
- msadp32.acm: works
-- MPEG layer 3: (0x55)
- l3codeca.acm: works (or you can use the built-in 3dnow-optimized codec)
-- VoxWare Metasound: (0x75)
- voxmsdec.ax: works
-- MS-GSM: (0x31,0x32)
- msgsm32.acm: works (or you can use the built-in codec)
-- IMA ADPCM (0x11)
- imaadp32.acm: works
-
-Problems:
-
-- uLaw audio: (0x7)
- mess...
-- ACELP.net Sipro Lab Audio (0x130)
- doesn't work: unk_ ...
-
-Not tested:
-
-- IMC: (0x401)
- imc32.acm: not tested (no sample file)
+See DOCS/codecs.conf
Extracting codecs from Win32
diff --git a/DOCS/MPlayer-FAQ b/DOCS/MPlayer-FAQ
index 5db16d6428..143447fdf9 100644
--- a/DOCS/MPlayer-FAQ
+++ b/DOCS/MPlayer-FAQ
@@ -137,7 +137,7 @@ A: ...but you don't have the X development package installed. Or not
Your distribution may differ from the Linux Filesystem Standard.
Q: I have problems playing files with ... codec. Can I use'em?
-A: Check DOCS/CODECS, if it doesn't contain your codec, contact us.
+A: Check DOCS/codecs.conf, if it doesn't contain your codec, contact us.
Q: What about DGA driver? I can't find it!!!
A: ./configure autodetects your DGA driver. If -vo help doesn't show
diff --git a/DOCS/README b/DOCS/README
index f0d2b7528b..9846e42cb8 100644
--- a/DOCS/README
+++ b/DOCS/README
@@ -75,8 +75,8 @@ Supported input formats:
Supported audio & video codecs:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*** See DOCS/CODECS for the complete list, or check ***
-*** http://mplayer.sourceforge.net/DOCS/codecs.html ***
+*** See DOCS/codecs.conf for the complete list, or check ***
+*** http://mplayer.sourceforge.net/DOCS/codecs.html ***
The most important video codecs:
- mpeg1 (VCD) and mpeg2 (DVD) video
@@ -91,9 +91,9 @@ The most important audio codecs:
- Voxware audio
- alaw, msgsm, pcm and other simple old audio formats
-If you have a codec not listed here, and not supported yet,
-just read CODECS to get info about its status or about how
-to help us adding support for it!
+If you have a codec not listed here, and not supported yet, just
+read DOCS/codecs.conf and CODECS to get info about its status or about
+how to help us adding support for it!
Supported video output devices:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~