[MPlayer-cvslog] CVS: main/etc codecs.conf,1.389,1.390
Diego Biurrun CVS
syncmail at mplayerhq.hu
Sat Feb 12 15:38:53 CET 2005
CVS change done by Diego Biurrun CVS
Update of /cvsroot/mplayer/main/etc
In directory mail:/var2/tmp/cvs-serv18681/etc
Modified Files:
codecs.conf
Log Message:
Comment and info field spelling/grammar corrections.
Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- codecs.conf 31 Jan 2005 22:36:57 -0000 1.389
+++ codecs.conf 12 Feb 2005 14:38:50 -0000 1.390
@@ -9,11 +9,11 @@
; VIDEO CODECS
;=============================================================================
-; mpeg 1/2 decoding:
+; MPEG-1/2 decoding:
; Note: mpegpes is preferred for hw decoders:
videocodec mpegpes
- info "Mpeg PES output (.mpg or Dxr3/DVB card)"
+ info "MPEG-PES output (.mpg or DXR3/DVB card)"
comment "for hardware decoding"
status working
format 0x10000001 ; mpeg 1
@@ -22,31 +22,31 @@
out MPES
videocodec mpeg12
- info "MPEG 1 or 2 (libmpeg2)"
+ info "MPEG-1 or 2 (libmpeg2)"
comment "with postprocessing"
status working
- format 0x10000001 ; mpeg 1
- format 0x10000002 ; mpeg 2
+ format 0x10000001 ; MPEG-1
+ format 0x10000002 ; MPEG-2
driver libmpeg2
; dll "libmpeg2"
out YV12,I420,IYUV
out 422P
videocodec ffmpeg1
- info "FFmpeg MPEG 1"
+ info "FFmpeg MPEG-1"
status working
- format 0x10000001 ; mpeg 1
+ format 0x10000001 ; MPEG-1
fourcc mpg1
- fourcc PIM1 ; Pinnacle hardware-mpeg1
+ fourcc PIM1 ; Pinnacle hardware-MPEG-1
fourcc VCR2
driver ffmpeg
dll "mpeg1video"
out YV12,I420,IYUV
videocodec ffmpeg2
- info "FFmpeg MPEG 2"
+ info "FFmpeg MPEG-2"
status working
- format 0x10000002 ; mpeg 2
+ format 0x10000002 ; MPEG-2
fourcc mpg2
driver ffmpeg
dll "mpeg2video"
@@ -55,12 +55,12 @@
; for backward compatibility
videocodec ffmpeg12
- info "FFmpeg MPEG 1/2"
+ info "FFmpeg MPEG-1/2"
status working
- format 0x10000001 ; mpeg 1
- format 0x10000002 ; mpeg 2
+ format 0x10000001 ; MPEG-1
+ format 0x10000002 ; MPEG-2
fourcc mpg1,mpg2
- fourcc PIM1 ; Pinnacle hardware-mpeg1
+ fourcc PIM1 ; Pinnacle hardware-MPEG-1
fourcc VCR2
driver ffmpeg
dll "mpegvideo"
@@ -68,18 +68,18 @@
out 422P,444P
videocodec ffmpeg12mc
- info "FFmpeg MPEG 1/2 (XvMC)"
+ info "FFmpeg MPEG-1/2 (XvMC)"
status buggy
- format 0x10000001 ; mpeg 1
- format 0x10000002 ; mpeg 2
+ format 0x10000001 ; MPEG-1
+ format 0x10000002 ; MPEG-2
fourcc mpg1,mpg2
- fourcc PIM1 ; Pinnacle hardware-mpeg1
+ fourcc PIM1 ; Pinnacle hardware-MPEG-1
driver ffmpeg
dll "mpegvideo_xvmc"
out IDCT_MPEG2
out MOCO_MPEG2
-; we have only native opensource codecs for these:
+; we have only native open source codecs for these:
videocodec nuv
info "NuppelVideo"
@@ -89,17 +89,17 @@
out I420,IYUV
videocodec mpng
- info "PNG images decoder"
+ info "PNG image decoder"
status working
comment "Gray scaled PNG with Alpha channel not supported"
fourcc mpng,MPNG
- fourcc "png " ; for PNG-encoded Quicktime files
+ fourcc "png " ; for PNG-encoded QuickTime files
dll "libpng"
driver mpng
out BGR32,BGR24
videocodec mtga
- info "TGA images decoder"
+ info "TGA image decoder"
status working
comment "Only 24bpp and 32bpp RGB TGA files supported"
fourcc mtga,MTGA
@@ -107,7 +107,7 @@
out BGR32,BGR24
videocodec sgi
- info "SGI images decoder"
+ info "SGI image decoder"
status working
fourcc SGI1 ; SGI1 is an internal MPlayer FOURCC
driver sgi
@@ -131,7 +131,7 @@
out BGR8
videocodec ffqtrle
- info "Quicktime Animation (RLE)"
+ info "QuickTime Animation (RLE)"
status working
format 0x20656C72 ; "rle "
driver ffmpeg
@@ -139,7 +139,7 @@
out BGR32,RGB24,BGR15,BGR8 query
videocodec ffrpza
- info "Quicktime Apple Video"
+ info "QuickTime Apple Video"
status working
fourcc rpza,azpr
driver ffmpeg
@@ -393,7 +393,7 @@
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 MP43,mp43 div3 ; M$ MPEG-4 v3 (fourcc mapping to div3)
fourcc DIV5,div5 div3 ; DivX 3.20
fourcc DIV6,div6 div4 ; -||-
fourcc DIV3,div3,DIV4,div4
@@ -497,7 +497,7 @@
out BGR32,BGR24,BGR16,BGR15
dll "libxvidcore.a"
-; divx4 does direct render, and is native on linux
+; divx4 does direct render, and is native on Linux
videocodec odivx
info "OpenDivX API (ODIVX,DIVX4,DIVX5,XVID)"
@@ -681,7 +681,7 @@
out BGR32,BGR24,BGR16
videocodec ubmp4
- info "UB Video MPEG 4"
+ info "UB Video MPEG-4"
comment "black&white"
status buggy
fourcc mp4v UMP4 ; black&white, sometimes buggy too
@@ -692,9 +692,9 @@
out UYVY
-; mjpegs:
-; Notes: m3jpeg+mjpeg are mmx optimized. avid is very stable but slow.
-; ijpg only decodes jpeg images (no mjpg), and slow.
+; MJPEG:
+; Notes: m3jpeg+mjpeg are MMX optimized. avid is very stable but slow.
+; ijpg only decodes JPEG images (no MJPEG), and slow.
; Update: ffmjpeg is almost perfect (and optimized) now, prefer it to others.
videocodec zrmjpeg
@@ -709,20 +709,20 @@
status working
fourcc MJPG,mjpg
fourcc AVRn,AVDJ ; AVID
- fourcc jpeg ; MOV photo-jpeg
+ fourcc jpeg ; MOV Photo-JPEG
fourcc mjpa ; Apple MJPEG-A (Quicktime)
fourcc JFIF ; SMJPEG (Loki)
fourcc ijpg,IJPG ; -mf type=jpeg
- fourcc JPEG ; SGI's AVI Photo-jpeg
- fourcc JPGL ; lossless jpeg (pegasus codec)
- fourcc LJPG ; lossless jpeg
+ fourcc JPEG ; SGI's AVI Photo-JPEG
+ fourcc JPGL ; lossless JPEG (pegasus codec)
+ fourcc LJPG ; lossless JPEG
driver ffmpeg
dll mjpeg
out 444P
out 422P
- out YUY2 ; queryed (conversion from yuv422p)
+ out YUY2 ; queried (conversion from yuv422p)
out YV12,I420,IYUV
- out BGR32 ; lossless jpeg
+ out BGR32 ; lossless JPEG
videocodec ffmjpegb
info "FFmpeg MJPEG-B decoder"
@@ -735,12 +735,12 @@
out YUY2 ; queryed (conversion from yuv422p)
out YV12,I420,IYUV
-; slow. usable only for standalone jpegs, like -mf, avid or photojpeg:
+; slow. usable only for standalone JPEGs, like -mf, avid or Photo-JPEG:
videocodec ijpg
info "Independent JPEG Group's codec"
status working
fourcc ijpg,IJPG ; -mf type=jpeg
- fourcc jpeg ; MOV Photo Jpeg
+ fourcc jpeg ; MOV Photo-JPEG
fourcc AVRn,AVDJ ; AVID
driver ijpg
dll libjpeg
@@ -782,11 +782,11 @@
out BGR24 flip
videocodec LEAD
- info "LEAD (M)Jpeg"
+ info "LEAD (M)JPEG"
status working
comment "supports interlaced MJPEG"
fourcc MJPG
- fourcc jpeg MJPG ; MOV Photo Jpeg
+ fourcc jpeg MJPG ; MOV Photo-JPEG
fourcc LEAD
driver vfw
dll "LCodcCMP.dll"
@@ -834,7 +834,7 @@
out BGR24 flip
videocodec pegasusl
- info "Pegasus Lossless JPEG"
+ info "Pegasus lossless JPEG"
status crashing
fourcc JPGL
fourcc MJPG JPGL
@@ -897,7 +897,7 @@
out YV12,I420,IYUV
videocodec ffh263
- info "FFmpeg H263+ decoder"
+ info "FFmpeg H.263+ decoder"
status working
fourcc H263,U263,h263,X263
fourcc viv1 h263
@@ -948,9 +948,9 @@
dll "msh261.drv"
out BGR32,BGR24,BGR15
-; indeo:
-; Note: indeo 3 is buggy, both xanim (bad decoding) and VfW (not work with DR)
-; Prefer win32 ones, they are faster, and 4/5 can DR. for fallback, there are
+; Indeo:
+; Note: Indeo 3 is buggy, both XAnim (bad decoding) and VfW (fails with DR)
+; Prefer win32 ones, they are faster, and 4/5 can DR. For fallback, there are
; Xanim codecs, they provide YV12, useful for YUV display or encoding.
videocodec indeo5ds
@@ -1077,7 +1077,7 @@
; 3ivx:
videocodec 3ivXxa
- info "XAnim's 3ivX Delta 3.5 plugin"
+ info "XAnim's 3ivx Delta 3.5 plugin"
status working
fourcc 3IV1
driver xanim
@@ -1085,7 +1085,7 @@
out YV12,IYUV,I420
videocodec 3ivX
- info "3ivX Delta 3.5"
+ info "3ivx Delta 3.5"
status crashing
fourcc 3IV1
driver dshow
@@ -1202,7 +1202,7 @@
status working
fourcc LCW2
driver dshow
- dll "LCODCCMW2E.dll"; eval need also LCMW2.dll
+ dll "LCODCCMW2E.dll"; eval also needs LCMW2.dll
guid 0xe2b7dc56, 0x38c5, 0x11d5, 0x91, 0xf6, 0x00, 0x10, 0x4b, 0xdb, 0x8f, 0xf9
out BGR24,BGR8 flip
@@ -1224,7 +1224,7 @@
out YV12,I420,IYUV
videocodec ffvp3
- info "FFmpeg's VP3-Codec"
+ info "FFmpeg VP3"
status untested
fourcc VP30,vp30,VP31,vp31
format 0x20335056 ; "VP3 " (used in .nsv files)
@@ -1233,7 +1233,7 @@
out YV12
videocodec fftheora
- info "FFmpeg's Theora"
+ info "FFmpeg Theora"
status untested
fourcc theo,Thra
format 0xFFFC
@@ -1242,9 +1242,9 @@
out YV12
videocodec vp3
- info "On2 OpenSource VP3-Codec"
+ info "On2 Open Source VP3 Codec"
status working
- comment "For SSE-systems use fixed dll from ftp://mplayerhq.hu/MPlayer/samples/drivers32/"
+ comment "For SSE-systems use fixed DLL from ftp://mplayerhq.hu/MPlayer/samples/drivers32/"
fourcc VP30,vp30,VP31,vp31
flags align16
driver vfwex
@@ -1354,7 +1354,7 @@
videocodec CJPG
info "CJPG"
status untested
- comment "need sample files (this dll is decompression only!)"
+ comment "sample files needed (this DLL is decompression only!)"
fourcc CJPG
driver vfw
dll "CtWbJpg.DLL"
@@ -1398,7 +1398,7 @@
out BGR24,BGR15 flip
videocodec vivd2
- info "SoftMedia ViVD V2 codec Vfw"
+ info "SoftMedia ViVD V2 codec VfW"
status working
fourcc GXVE,gxve
driver vfw
@@ -1452,7 +1452,7 @@
out YUY2
videocodec qtavui
- info "win32/quicktime Avid Meridien Uncompressed"
+ info "Win32/QuickTime Avid Meridien Uncompressed"
status working
fourcc AVUI
driver qtvideo
@@ -1460,7 +1460,7 @@
out YUY2
videocodec qth263
- info "win32/quicktime H.263 decoder"
+ info "Win32/QuickTime H.263 decoder"
status crashing
fourcc h263
driver qtvideo
@@ -1468,7 +1468,7 @@
out YUY2
videocodec qtrlerpza
- info "win32/quicktime RLE/RPZA decoder"
+ info "Win32/Quicktime RLE/RPZA decoder"
comment "no colorspace accepted"
status crashing
fourcc rpza
@@ -1478,7 +1478,7 @@
out BGR32,BGR24,BGR15
videocodec qtvp3
- info "win32/quicktime VP3 decoder"
+ info "Win32/QuickTime VP3 decoder"
status crashing
fourcc VP31
driver qtvideo
@@ -1495,7 +1495,7 @@
out BGR32,RGB32
videocodec qtbhiv
- info "win32/quicktime BeHereiVideo decoder"
+ info "Win32/QuickTime BeHereiVideo decoder"
comment "sample file wanted!"
status untested
fourcc bhiv
@@ -1504,7 +1504,7 @@
out YUY2
videocodec qtcvid
- info "win32/quicktime Cinepak decoder"
+ info "Win32/QuickTime Cinepak decoder"
status working
fourcc cvid
driver qtvideo
@@ -1512,7 +1512,7 @@
out YUY2
videocodec qtindeo
- info "win32/quicktime Indeo decoder"
+ info "Win32/QuickTime Indeo decoder"
status crashing
fourcc IV31,iv31
fourcc IV32,iv32
@@ -1522,7 +1522,7 @@
out YUY2
videocodec qtmjpeg
- info "win32/quicktime MJPEG decoder"
+ info "Win32/QuickTime MJPEG decoder"
status crashing
fourcc dmb1
fourcc mjpa
@@ -1532,7 +1532,7 @@
out YUY2
videocodec qtmpeg4
- info "win32/quicktime MPEG-4 decoder"
+ info "Win32/QuickTime MPEG-4 decoder"
status crashing
fourcc mp4v
driver qtvideo
@@ -1540,7 +1540,7 @@
out YUY2
videocodec qtsvq3
- info "win32/quicktime SVQ3 decoder"
+ info "Win32/QuickTime SVQ3 decoder"
status working
fourcc SVQ3
driver qtvideo
@@ -1548,7 +1548,7 @@
out YUY2
videocodec qtsvq1
- info "win32/quicktime SVQ1 decoder"
+ info "Win32/QuickTime SVQ1 decoder"
status buggy
fourcc SVQ1
driver qtvideo
@@ -1627,7 +1627,7 @@
out RGB24 flip
videocodec pim1
- info "Pinnacle Hardware MPEG1"
+ info "Pinnacle Hardware MPEG-1"
status crashing
comment "no picture. use ffmpeg12!"
fourcc PIM1
@@ -1676,7 +1676,7 @@
; raw formats: (now RGB formats are autodetected)
-; these raw codecs are used mostly by tv input
+; these raw codecs are used mostly by TV input
; 0x20776172 is used by Quicktime ('raw ')
; 0x0 is used by AVI
; YV12,RGB|32,RGB|24.. is created by MPlayer
@@ -1951,7 +1951,7 @@
guid 0x795b44c4, 0xf142, 0x493d, 0x8a, 0x02, 0x09, 0xbd, 0x41, 0x08, 0x95, 0xad
audiocodec qdmc
- info "Quicktime QDMC/QDM2 audio decoders"
+ info "QuickTime QDMC/QDM2 audio decoders"
status working
format 0x324D4451 ; "QDM2"
format 0x434D4451 ; "QDMC"
@@ -1959,21 +1959,21 @@
dll "QuickTime.qts"
audiocodec qclp
- info "Quicktime QCLP audio decoder"
+ info "QuickTime QCLP audio decoder"
status working
format 0x706C6351 ; "QCLP"
driver qtaudio
dll "QuickTime.qts"
audiocodec qtmace3
- info "Quicktime MACE3 audio decoder"
+ info "QuickTime MACE3 audio decoder"
status working
format 0x3343414D ; "MAC3"
driver qtaudio
dll "QuickTime.qts"
audiocodec qtmace6
- info "Quicktime MACE6 audio decoder"
+ info "QuickTime MACE6 audio decoder"
status working
format 0x3643414D ; "MAC6"
driver qtaudio
@@ -2203,14 +2203,14 @@
driver mp3lib
audiocodec ffwmav1
- info "DivX audio v1 (ffmpeg)"
+ info "DivX audio v1 (FFmpeg)"
status untested
format 0x160
driver ffmpeg
dll "wmav1"
audiocodec ffwmav2
- info "DivX audio v2 (ffmpeg)"
+ info "DivX audio v2 (FFmpeg)"
status untested
format 0x161
driver ffmpeg
@@ -2357,7 +2357,7 @@
audiocodec ac3
info "AC3-libac3"
- comment "removed from mplayer, use liba52"
+ comment "removed from MPlayer, use liba52"
status working
format 0x2000
fourcc dnet
@@ -2424,7 +2424,7 @@
dll "adpcm_ct"
audiocodec ctadp32
- info "Creative ADPCM CODEC"
+ info "Creative ADPCM codec"
status working
format 0x200
driver acm
@@ -2438,14 +2438,14 @@
dll "mi-sc4.acm"
audiocodec hwac3
- info "AC3 through SPDIF"
+ info "AC3 through S/PDIF"
status working
format 0x2000
fourcc dnet
driver hwac3
audiocodec hwdts
- info "DTS through SPDIF"
+ info "DTS through S/PDIF"
status working
format 0x2001
driver hwac3
More information about the MPlayer-cvslog
mailing list