Mercurial > mplayer.hg

changeset 6584:07b8c8a03503

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some cleanup, buggy->crashing, better info/comments
author arpi
date Fri, 28 Jun 2002 09:33:38 +0000
parents 4b7d097a9c69
children eb10ce6b3f18
files etc/codecs.conf
diffstat 1 files changed, 45 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Fri Jun 28 06:07:46 2002 +0000
+++ b/etc/codecs.conf	Fri Jun 28 09:33:38 2002 +0000
@@ -19,7 +19,6 @@
   format 0x10000001  ; mpeg 1
   format 0x10000002  ; mpeg 2
   driver mpegpes
-  dll "mpegpes"
   out MPES
 
 videocodec mpeg12
@@ -33,7 +32,7 @@
   out YV12,I420,IYUV
 
 videocodec ffmpeg12
-  info "FFmpeg-1"
+  info "FFmpeg MPEG 1/2"
   status working
   format 0x10000001  ; mpeg 1
   format 0x10000002  ; mpeg 2
@@ -53,10 +52,11 @@
   out I420,IYUV
 
 videocodec mpng
-  info "mPNG codec"
+  info "PNG images decoder"
   status working
   comment "Gray scaled PNG with Alpha channel not supported"
   fourcc mpng,MPNG
+  dll "libpng"
   driver mpng
   out BGR32,BGR24
 
@@ -188,7 +188,7 @@
 ;XAnim (slow):
 
 videocodec cvidxa
-  info "Radius Cinepak Video"
+  info "XAnim's Radius Cinepak Video"
   status working
   fourcc cvid
   driver xanim
@@ -196,7 +196,7 @@
   out YV12,IYUV,I420
 
 videocodec cyuvxa
-  info "Creative CYUV"
+  info "XAnim's Creative CYUV"
   status untested
   fourcc CYUV,cyuv
   driver xanim
@@ -263,7 +263,7 @@
 ; divx4 does direct render, and is native on linux
 
 videocodec odivx
-  info "OpenDivX (MPEG-4 v2)"
+  info "OpenDivX API (ODIVX,DIVX4,DIVX5,XVID)"
   comment "with postprocessing"
   status working
   fourcc DIVX,divx
@@ -275,11 +275,11 @@
   fourcc DX50
   format 0x4
   driver odivx
-  dll "opendivx decore"
+  dll "libdivxdecore.0"
   out YV12,I420,IYUV
 
 videocodec divx4
-  info "DivX4Linux (MPEG-4 v2,v3)"
+  info "DivX4Linux API (DIVX4,DIVX5,XVID)"
   comment "with postprocessing"
   status working
   fourcc DIVX,divx
@@ -300,7 +300,7 @@
 ; is divx4vfw stable enough, working everywhere and faster than divxds?
 
 videocodec divx4vfw
-  info "DivX4Windows-VFW (DivX 3.x, DivX4)"
+  info "DivX4Windows-VFW"
   status buggy
   comment "sig11 with -framedrop"
   fourcc DIVX,divx        ; opendivx / divx4
@@ -431,7 +431,7 @@
   out BGR32,BGR24,BGR15
 
 videocodec avid
-  info "AVID"
+  info "AVID Motion JPEG"
   status working
   fourcc AVRn
   fourcc AVDJ AVRn
@@ -451,12 +451,13 @@
   out BGR24,BGR15
 
 videocodec ijpg
-  info "IJPG codec"
+  info "Independent JPEG Group's codec"
   status working
   fourcc ijpg,IJPG
   fourcc jpeg       ; MOV Photo Jpeg
   fourcc AVRn,AVDJ  ; AVID
   driver ijpg
+  dll libjpeg
   out RGB24,BGR24,BGR32
 
 videocodec ffmjpeg
@@ -524,7 +525,6 @@
 
 videocodec u263
   info "UB Video H.263/H.263+/H.263++ Decoder"
-  comment "added by Juanjo"
   status working
   fourcc U263
   fourcc vivo,VIVO U263
@@ -566,7 +566,7 @@
   out YV12,I420,IYUV
 
 videocodec h263xa
-  info "CCITT H.263"
+  info "XAnim's CCITT H.263"
   status working
   fourcc H263,h263
   fourcc viv1 H263
@@ -576,7 +576,7 @@
   out YV12,IYUV,I420
 
 videocodec h261xa
-  info "CCITT H.261"
+  info "XAnim's CCITT H.261"
   status untested
   fourcc H261,h261
   driver xanim
@@ -639,7 +639,7 @@
   in YVU9
 
 videocodec indeo5xa
-  info "Intel Indeo 5"
+  info "XAnim's Intel Indeo 5"
   status working
   fourcc IV50,iv50
   driver xanim
@@ -647,7 +647,7 @@
   out YVU9,YV12,IYUV,I420
 
 videocodec indeo4xa
-  info "Intel Indeo 4.1"
+  info "XAnim's Intel Indeo 4.1"
   status working
   fourcc IV41,iv41
   driver xanim
@@ -655,7 +655,7 @@
   out YVU9,YV12,IYUV,I420
 
 videocodec indeo3xa
-  info "Intel Indeo 3.1/3.2"
+  info "XAnim's Intel Indeo 3.1/3.2"
   status working
   fourcc IV31,iv31
   fourcc IV32,iv32
@@ -691,7 +691,7 @@
 ; 3ivx:
 
 videocodec 3ivXxa
-  info "3ivX Delta 3.5"
+  info "XAnim's 3ivX Delta 3.5 plugin"
   status working
   fourcc 3IV1
   driver xanim
@@ -712,7 +712,7 @@
 ; experimental real video decoder using closed source codecs
 
 videocodec rv30
-  info "RealPlayer 8 RV30 decoder"
+  info "Linux RealPlayer 8 RV30 decoder"
   status working
   fourcc RV30,rv30
   driver realvid
@@ -720,7 +720,7 @@
   out I420
 
 videocodec rv30win
-  info "RealPlayer 8 RV30 decoder"
+  info "Win32 RealPlayer 8 RV30 decoder"
   status crashing
   fourcc RV30,rv30
   driver realvid
@@ -728,7 +728,7 @@
   out I420
 
 videocodec rv20
-  info "RealPlayer 8 RV20 decoder"
+  info "Linux RealPlayer 8 RV20 decoder"
   status working
   fourcc RV20,rv20
   driver realvid
@@ -877,7 +877,7 @@
   info "Alaris VideoGramPiX"
 ; http://www.alaris.com/movies/toocool.vgm
 ; Martin Schuster <schuster@ap.univie.ac.at>
-  status buggy
+  status crashing
   comment "only produces strange patterns"
   fourcc VGPX,VTLP VGPX
   driver vfwex
@@ -890,7 +890,7 @@
 
 videocodec vcr1
   info "ATI VCR-1"
-  status buggy
+  status crashing
   fourcc VCR1
   driver vfw
   dll "ativcr1.dll"
@@ -898,7 +898,7 @@
 
 videocodec pim1
   info "PIM1"
-  status buggy
+  status crashing
   comment "no picture. use ffmpeg12!"
   fourcc PIM1
   driver vfw
@@ -920,7 +920,7 @@
 
 videocodec rricm
   info "rricm"
-  status buggy
+  status crashing
   fourcc dmb1
   driver vfw
   dll "rricm.dll"
@@ -987,6 +987,15 @@
   format 0x42475218
   out BGR24 flip
 
+videocodec rawbgr16
+  info "RAW BGR15"
+  status working
+  driver raw
+  format 0x0
+  format 0x20776172
+  format 0x42475210
+  out BGR16 flip
+
 videocodec rawbgr15
   info "RAW BGR15"
   status working
@@ -1016,7 +1025,6 @@
 
 videocodec rawyv12
   info "RAW YV12"
-  comment "pre-postprocessing support"
   status working
   driver raw
   format 0x0
@@ -1031,7 +1039,8 @@
   format 0x0
   format 0x20776172
   fourcc i420,I420
-  out I420
+  fourcc IYUV,iyuv
+  out I420,IYUV
 
 videocodec rawyvu9
   info "RAW YVU9"
@@ -1053,6 +1062,7 @@
   out I420
   out YUY2
   out UYVY
+  out YVU9
   out BGR32,BGR24,BGR16,BGR15
 
 ;=============================================================================
@@ -1061,7 +1071,7 @@
 
 audiocodec racook
   info "RealAudio COOK"
-  status untested
+  status working
   format 0x6B6F6F63 ; "cook"
   driver realaud
   dll "cook.so.6.0"
@@ -1121,7 +1131,6 @@
 ;  format 0x2000
 ;;;;
   driver pcm
-  dll "uncompressed"
 
 audiocodec divx
   info "DivX audio (WMA)"
@@ -1139,7 +1148,7 @@
   dll "msadp32.acm"
 
 audiocodec mp3
-  info "MPEG layer-2, layer-3"
+  info "mp3lib MPEG layer-2, layer-3"
   status working
   comment "Optimized to MMX/SSE/3Dnow!"
   format 0x50
@@ -1147,14 +1156,13 @@
   format 0x33706d2e  ; ".mp3" CBR/VBR MP3 (MOV files)
   format 0x5500736d  ; "ms\0\x55" older mp3 fcc (MOV files)
   driver mp3lib
-  dll "mp3lib (mpglib)"
+  dll "mp3lib"
   flags seekable
 
 ;MAD library
 audiocodec mad
-  info "MAD MPEG layer-2, layer-3"
+  info "libMAD MPEG layer 1,2,3"
   status working
-  comment "Optimized for ARM, unstable"
   format 0x50
   format 0x55
   format 0x33706d2e  ; ".mp3" CBR/VBR MP3 (MOV files)
@@ -1174,7 +1182,7 @@
   flags seekable
 
 audiocodec ffmp2
-  info "FFmpeg layer-12 audio decoder - integer only"
+  info "FFmpeg layer 1,2 audio decoder - integer only"
   status working
   format 0x50
   driver ffmpeg
@@ -1219,14 +1227,12 @@
   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"
@@ -1234,14 +1240,12 @@
   format 0x7
   format 0x77616c75  ; "ulaw" (MOV files)
   driver alaw
-  dll "ulaw"
 
 audiocodec dvdpcm
-  info "Uncompressed DVD PCM"
+  info "Uncompressed DVD LPCM"
   status working
   format 0x10001
   driver dvdpcm
-  dll "uncompressed"
 
 audiocodec a52
   info "AC3-liba52"
@@ -1252,6 +1256,7 @@
 
 audiocodec ac3
   info "AC3"
+  comment "removed from mplayer, use liba52"
   status working
   format 0x2000
   driver libac3
@@ -1286,7 +1291,6 @@
   status working
   format 0x2000
   driver hwac3
-  dll "ac3-iec958.c"
 
 audiocodec vorbis
   info "OggVorbis Audio Decoder"
@@ -1310,7 +1314,7 @@
 
 audiocodec g72x
   info "G.711/G.721/G.723"
-  status untested
+  status crashing
   comment "does not work yet - just noise :("
   format 0x111	    ; vivo g.723
   format 0x112	    ; vivo siren