From 3989ffc16a40cef40e8b8e0bb0284ebca1f96baf Mon Sep 17 00:00:00 2001 From: arpi Date: Tue, 21 Aug 2001 21:59:39 +0000 Subject: DOCS/codecs.conf -> etc/codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1615 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/codecs.conf | 548 ------------------------------------------------------ DOCS/example.conf | 124 ------------ DOCS/inttypes.h | 13 -- 3 files changed, 685 deletions(-) delete mode 100644 DOCS/codecs.conf delete mode 100644 DOCS/example.conf delete mode 100644 DOCS/inttypes.h (limited to 'DOCS') diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf deleted file mode 100644 index 5359a84569..0000000000 --- a/DOCS/codecs.conf +++ /dev/null @@ -1,548 +0,0 @@ -; Default codecs config file. It replaces the old codecs.c file! - -;============================================================================= -; VIDEO CODECS -;============================================================================= - -; =============== Win32/libmpeg2/ProjectMayo MPEG CODECS ===================== - -videocodec u263 - info "UB Video H.263+ Decoder" - comment "added by Juanjo" - status working - fourcc U263 - driver dshow - dll "ubv263d+.ax" - guid 0x00af1181, 0x6ebb, 0x11d4, 0x9d, 0x5a, 0x00, 0x50, 0x04, 0x79, 0x6c, 0xc0 -; out I420 flip -; out YVYU flip,noflip -; out YV12 flip -; out UYVY flip,noflip -; out YUY2 flip - out BGR24 flip - -videocodec divxds - info "DivX ;-) (MS MPEG-4 v3)" - comment "with postprocessing" - status working - fourcc MP43,mp43 div3 ; fourcc mapping to div3 - fourcc DIV5,div5 div3 - fourcc DIV6,div6 div4 - fourcc DIV3,div3,DIV4,div4 - fourcc AP41 div3 ; AngelPotion stuff - driver dshow - dll "divx_c32.ax" - guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa -; out YV12 - out YUY2 - out BGR32,BGR24,BGR16,BGR15 - -videocodec mpeg12 - info "MPEG 1 or 2" - comment "with postprocessing" - status working - format 0x10000001 ; mpeg 1 - format 0x10000002 ; mpeg 2 - driver libmpeg2 - dll "libmpeg2" - out YV12 - -videocodec mpeg4 - info "Microsoft MPEG-4 v1/v2" - status working -; comment "No postprocessing" - fourcc MPG4,mpg4 - fourcc MP42,mp42 - fourcc DIV2 mp42 - driver vfw - dll "mpg4c32.dll" - out YUY2 yuvhack - out BGR32,BGR24,BGR15 - -videocodec mpeg4ds - info "Microsoft MPEG-4 v1/v2" - status working -; comment "with postprocessing" - fourcc DIV2,div2 mp42 - fourcc MPG4,mpg4 - fourcc MP42,mp42 - driver dshow - dll "mpg4ds32.ax" - guid 0x82CCD3E0, 0xF71A, 0x11D0, 0x9F, 0xE5, 0x00, 0x60, 0x97, 0x78, 0xEA, 0x66 - out YUY2 - out BGR32,BGR24,BGR16,BGR15 - -videocodec divx - info "DivX ;-) (MS MPEG-4 v3)" - status working - fourcc MP43,mp43 div3 ; M$ MPEG4 v3 (fourcc mapping to div3) - fourcc DIV5,div5 div3 ; DivX 3.20 - fourcc DIV6,div6 div4 ; -||- - fourcc DIV3,div3,DIV4,div4 - fourcc AP41 div3 ; AngelPotion stuff - driver vfw - dll "divxc32.dll" - out YUY2 yuvhack - out BGR32,BGR24,BGR15 - - -videocodec odivx - info "OpenDivX (MPEG-4 v2)" - comment "with postprocessing" - status working - fourcc DIVX,divx - fourcc DIV1,div1 divx - fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 - fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only! - fourcc AP41 DIV3 ; AngelPotion stuff - format 0x4 - driver odivx - dll "opendivx decore" - out YV12 - -videocodec divx4 - info "DivX4Linux (MPEG-4 v2,v3)" - comment "with postprocessing" - status working - fourcc DIVX,divx - fourcc DIV1,div1 divx - fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 - fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only! - fourcc AP41 DIV3 ; AngelPotion stuff - format 0x4 - driver divx4 - dll "libdivxdecore.0" -; out YV12 ; works, but odivx driver is faster with YV12 (DEC_USER) -; out I420 - out YUY2 - out UYVY - out BGR32,BGR24,BGR16,BGR15 - -videocodec i263 - info "I263" - status working - fourcc I263,i263,I420,i420 - driver vfw - dll "i263_32.drv" -; out I420 - out YUY2 - out BGR32,BGR24,BGR15 - -videocodec mjpeg - info "Motion JPEG" - status working - fourcc MJPG - driver vfw - dll "mcmjpg32.dll" -; dll "m3jpeg32.dll" - out YUY2 - out UYVY - out BGR32,BGR24,BGR15 - -; =============== FFMPEG MPEG CODECS ========================= - -videocodec ffmjpeg - info "FFmpeg MJPEG decoder" - status working - fourcc MJPG,mjpg - driver ffmpeg - dll mjpeg -; out YUY2 - out YV12 - -videocodec ffi263 - info "FFmpeg I263 decoder" - status working - fourcc I263,i263 - driver ffmpeg - dll h263i - out YV12 - -videocodec ffh263 - info "FFmpeg H263+ decoder" - status working - fourcc H263,U263 - driver ffmpeg - dll h263 - out YV12 - -videocodec ffdivx - info "FFmpeg DivX ;-) (MS MPEG-4 v3)" - status working - fourcc MPG3,mpg3 div3 - fourcc MP43,mp43 div3 ; M$ MPEG4 v3 (fourcc mapping to div3) - fourcc DIV5,div5 div3 ; DivX 3.20 - fourcc DIV6,div6 div4 ; -||- - fourcc DIV3,div3,DIV4,div4 - fourcc AP41 div3 ; AngelPotion stuff - driver ffmpeg - dll msmpeg4 - out YV12 - -videocodec ffodivx - info "FFmpeg OpenDivX" - status working -; comment "doesn't support >= 4.0alpha48 movies yet" - fourcc DIVX,divx - fourcc DIV1,div1 divx - fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 - format 0x4 - driver ffmpeg - dll opendivx - out YV12 - -videocodec ffmpeg12 - info "FFmpeg-1" - status working - format 0x10000001 ; mpeg 1 - format 0x10000002 ; mpeg 2 - driver ffmpeg - dll "mpegvideo" - out YV12 - - -; ============== OTHER STUFF ======================= - - -videocodec indeo5ds - info "Intel Indeo 5" - status working - fourcc IV50,iv50 - driver dshow - dll "ir50_32.dll" - guid 0x30355649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 -; out YV12,I420 - out YUY2 - out BGR32,BGR24,BGR16,BGR15 - -videocodec indeo5 - info "Intel Indeo 5" - status working - fourcc IV50,iv50 - driver vfw - dll "ir50_32.dll" -; out YV12,I420 ; flickering - out YUY2 - out BGR32,BGR24,BGR15 - -videocodec indeo4 - info "Intel Indeo 4.1" - status working -; comment "upside-down" - fourcc IV41,iv41 - driver vfw - dll "ir41_32.dll" - out BGR24,BGR15 - -videocodec indeo3 - info "Intel Indeo 3.1/3.2" - status buggy - comment "upside-down with some vo drivers, (no yuv)" - fourcc IV31,iv31 - fourcc IV32,iv32 - driver vfw - dll "ir32_32.dll" - out BGR24,BGR15 flip - -videocodec cvid - info "Cinepak Video" - status working - fourcc cvid - driver vfw - dll "iccvid.dll" -; out YUY2 -; out UYVY - out BGR24,BGR15 - -videocodec cram - info "Microsoft Video 1" - status working - fourcc cram,CRAM,MSVC - driver vfw - dll "msvidc32.dll" - out BGR24,BGR15 - -videocodec vcr2 - info "ATI VCR-2" - status crashing - comment "segfault" - fourcc VCR2 - driver vfw - dll "ativcr2.dll" - out YUY2 - out BGR32,BGR24,BGR15 - -videocodec wmv7 - info "Windows Media Video 7" - status working - fourcc WMV1 - driver dshow - dll "wmvds32.ax" - guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae -; out I420 - out YUY2 - out BGR32,BGR24,BGR16,BGR15 - -videocodec wmv8 - info "Windows Media Video 8" - status working - fourcc WMV2 - driver dshow - dll "wmv8ds32.ax" - guid 0x521fb373, 0x7654, 0x49f2, 0xbd, 0xb1, 0x0c, 0x6e, 0x66, 0x60, 0x71, 0x4f - out YUY2 - out BGR32,BGR24,BGR16,BGR15 - -videocodec tm20 - info "TrueMotion 2.0" - status crashing - comment "segfault in the DLL" - fourcc TM20 - driver dshow - dll "tm20dec.ax" - guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84 -; out UYVY - out YUY2 - out BGR32,BGR24,BGR16,BGR15 - -videocodec dv - info "Sony Digital Video (DV)" - status working - fourcc DVSD dvsd - driver dshow - dll "qdv.dll" - guid 0xB1B77C00, 0xC3E4, 0x11CF, 0xAF, 0x79, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42 - out YUY2 - out UYVY - out BGR32,BGR24,BGR16,BGR15 - -videocodec morgands - info "Morgan MJPEG" - status crashing - fourcc MJPG mjpg - driver dshow - dll "M3JPEGdec.ax" - guid 0x6988b440, 0x8352, 0x11d3, 0x9b, 0xda, 0xca, 0x86, 0x73, 0x7c, 0x71, 0x68 - out YUY2 - out BGR32,BGR24,BGR16,BGR15 - -videocodec huffyuv - info "HuffYUV" - status buggy - comment "YUY2 _or_ 24/32bpp only (depending on file encoding)" - fourcc HFYU - driver vfw - dll "huffyuv.dll" - out YUY2 flip,noflip -; out UYVY flip - out BGR32,BGR24 flip - -videocodec mszh - info "AVImszh" - status crashing - comment "calls RegEnumValueA()" - fourcc MSZH - driver vfw - dll "avimszh.dll" - out YUY2 - out BGR32,BGR24,BGR15 - -videocodec zlib - info "AVIzlib" - status crashing - comment "calls RegEnumValueA()" - fourcc ZLIB - driver vfw - dll "avizlib.dll" - out YUY2 - out BGR32,BGR24,BGR15 - -videocodec mwv1 - info "Motion Wavelets" - status crashing - comment "decompressquery failed" - fourcc MWV1 - driver vfw - dll "icmw_32.dll" -; out YV12 - out YUY2 - out BGR32,BGR24,BGR15 - - -videocodec m261 - info "M261" - status untested - fourcc m261,M261 - driver vfw - dll "msh261.drv" - out BGR32,BGR24,BGR15 - -videocodec asv2 - info "ASUS V2" - status buggy - comment "rgb upside down, yuv ok" - fourcc ASV2 - driver vfw - dll "asusasv2.dll" -; out YVYU - out UYVY - out BGR32,BGR24,BGR15 flip - -videocodec asv1 - info "ASUS V1" - status buggy - comment "rgb upside down, yuv ok" - fourcc ASV1 - driver vfw - dll "asusasvd.dll" -; out YVYU - out UYVY - out BGR32,BGR24,BGR15 flip - -videocodec null - info "NULL codec (no decoding)" - status working - comment "for unknown/unsupported codecs or testing" - driver null - out YV12 - out I420 - out YUY2 - out UYVY - out BGR32,BGR24,BGR16,BGR15 - -;============================================================================= -; AUDIO CODECS -;============================================================================= - -audiocodec pcm - info "Uncompressed PCM" - status working - format 0x1 -;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3) -; format 0x6 -; format 0x7 -; format 0x11 -; format 0x50 -; format 0x2000 -;;;; - driver pcm - dll "uncompressed" - -audiocodec divx - info "DivX audio (WMA)" - status working - format 0x160 - format 0x161 - driver acm - dll "divxa32.acm" - -audiocodec msadpcm - info "MS ADPCM" - status working - format 0x2 - driver acm - dll "msadp32.acm" - -; now mp3lib is stable enough!? -audiocodec mp3 - info "MPEG layer-2, layer-3" - status working - comment "Optimized to AMD 3Dnow!" - format 0x50 - format 0x55 - driver mp3lib - dll "mp3lib (mpglib)" - flags seekable - -audiocodec mp3acm - info "MPEG layer-3" - status working - comment "Optimized to Intel MMX/SSE, conflicts with security kernel patches" - format 0x55 - driver acm - dll "l3codeca.acm" - flags seekable - -audiocodec imaadpcm - info "IMA ADPCM" - status working - format 0x11 - driver acm - dll "imaadp32.acm" - -audiocodec msgsmacm - info "MS GSM" - status working - format 0x31 - format 0x32 - driver acm - dll "msgsm32.acm" - -audiocodec msgsm - info "MS GSM" - status working - format 0x31 - format 0x32 - driver msgsm - dll "xa_gsm.c" - -audiocodec alaw - info "aLaw" - status working - format 0x6 - driver alaw - dll "alaw" - -audiocodec ulaw - info "uLaw" - status working - format 0x7 - driver alaw - dll "ulaw" - -audiocodec dvdpcm - info "Uncompressed DVD PCM" - status working - format 0x10001 - driver dvdpcm - dll "uncompressed" - -audiocodec ac3 - info "AC3" - status working - format 0x2000 - driver libac3 - dll "libac3" - -audiocodec voxware - info "VoxWare" - status working ; audio is bubbling - format 0x75 - driver dshow - dll "voxmsdec.ax" - guid 0x73f7a062, 0x8829, 0x11d1, 0xb5, 0x50, 0x00, 0x60, 0x97, 0x24, 0x2d, 0x8d - -audiocodec acelp - info "ACELP.net Sipro Lab Audio Decoder" - status crashing - comment "DS: cannot connect Output pin" - format 0x130 - driver dshow - dll "acelpdec.ax" - guid 0x4009f700, 0xaeba, 0x11d1, 0x83, 0x44, 0x00, 0xc0, 0x4f, 0xb9, 0x2e, 0xb7 - -audiocodec imc - info "Intel Music Coder" - status working - comment "driver at http://codeczone.virtualave.net/FXIMCAUD.zip" - format 0x401 - driver acm - dll "imc32.acm" - -audiocodec hwac3 - info "AC3 through SPDIF" - status working - format 0x2000 - driver hwac3 - dll "ac3-iec958.c" - diff --git a/DOCS/example.conf b/DOCS/example.conf deleted file mode 100644 index a5df53c935..0000000000 --- a/DOCS/example.conf +++ /dev/null @@ -1,124 +0,0 @@ -## -## MPlayer config file -## -## This file can be copied to /etc/mplayer.conf and/or ~/.mplayer/config . -## If both exist, the ~/.mplayer/config's settings override the -## /etc/mplayer.conf ones. And, of course command line overrides all. -## The options are the same as in the command line, but they can be specified -## more flexibly here. See below. -## - -vo=xv # To specify default video driver (see -vo help for - # list) - -ao=oss # To specify default audio driver (see -ao help for - # list) - -fs=yes # Enlarges movie window to your desktop's size. - # Used by drivers: all - -# fsmode=0 # This option workarounds some problems when using - # specific windowmanagers and fullscreen mode. If you - # experience fullscreen problems, try changing this - # value between 0 and 7. Hint: either 0 or 1 should - # be sufficient. - # 0 = new method (since 0.18pre3) - # 1 = ICCCWM patch (for KDE2/icewm) - # 2 = old method (0.17a) - # 3 = ICCCWM patch + Motif method - -#vm=no # Tries to change to a different videomode - # Used by drivers: dga2, x11, sdl - -#bpp=0 # Force changing display depth. - # Valid settings are: 0, 15, 16, 24, 32 - # may need 'vm=yes' too. - # Used by drivers: fbdev, dga2, svga - -#zoom=no # Enable software scaling (powerful CPU needed) - # Used by drivers: svga, aalib - -# double=yes # use double-buffering (recommended for xv with - # SUB/OSD usage) - -# x=800 # scale movie to pixels width -# y=600 # scale movie to pixels height - -## -## Multiple languages are available :) -## -## Hungarian igen nem -## English yes no -## German ja nein -## Spanish si no -## Binary 1 0 -## -## You can also use spaces and/or tabs. -## - -#sound = 1 -#nosound = nein -#mixer = /dev/mixer -#master = no # no : set PCM volume yes : set MASTER volume - -## -## resample the fonts' alphamap -## 0 plain white fonts -## 0.75 very narrow black outline (default) -## 1 narrow black outline -## 10 bold black outline -## - -#ffactor = 0.75 - -## -## FBdev driver: specify your monitor's timings, so resolutions -## can be autodetected. -## (see for example /etc/X11/XF86Config for timings!) -## ** CAUTION! IF YOUR DISPLAY DOESN'T SUPPORT AUTOMATICALLY TURNING OFF WHEN -## OVERDRIVED (AND EVEN IF IT DOES), THIS MAY CAUSE DAMAGE TO YOUR DISPLAY! -## WE AREN'T RESPONSIBLE, IT'S YOUR DECISION! ** -## -## k, K : means multiply by 1000 -## m, M : means multiply by 1.000.000 -## - -# fb = /dev/fb0 # framebuffer device to use -# fbmode = 640x480-120 # use this mode (read from fb.modes!) -# fbmodeconfig = /etc/fb.modes # the fb.modes file -# monitor_hfreq = 31.5k-50k,70k # horizontal frequency range -# monitor_vfreq = 50-90 # vertical frequency range -# monitor_dotclock = 30M-300M # dotclock (or pixelclock) range - -## -## SDL driver -## - -# vo = sdl:aalib # use SDL video driver by default - # use "vo = sdl:aalib" or "vo sdl:dga" and so on, - # for specifying SDL subdrivers -# ao = sdl:esd # use SDL audio driver by default - # use "ao = sdl:esd" to use SDL's ESD driver -# noxv = no # whether to use XVideo hardware acceleration or not -# forcexv = yes # force XVideo even if not detected - -# nodshow # disable usage of DirectShow video codecs - - -## -## Other (preferred to be default from configfile) switches -## - -framedrop = yes # drop frames, when not in sync (slow CPU, videocard, - # etc) - -# vfm = 5 # use libavcodec video codec family (you know, - # opensource DivX for example.. So preferred default on - # non-x86 boxes) - -## -## You can also include other configfiles -## Specify full path! -## - -include = /home/gabucino/.mplayer/savage4.conf # comment-me-out! :) diff --git a/DOCS/inttypes.h b/DOCS/inttypes.h deleted file mode 100644 index b1e93879e4..0000000000 --- a/DOCS/inttypes.h +++ /dev/null @@ -1,13 +0,0 @@ - -// fallback if the user doesn't have inttypes.h (libc5 systems) - -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned long uint32_t; -typedef unsigned long long uint64_t; - -typedef signed char int8_t; -typedef signed short int16_t; -typedef signed long int32_t; -typedef signed long long int64_t; - -- cgit v1.2.3