reordered video codecs to work better with new codec selection code

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5375 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 580 insertions, 559 deletions

diff --git a/etc/codecs.conf b/etc/codecs.conf
index ad8e7903cc..3ab2446fb6 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1,6 +1,5 @@
 ;=============================================================================
 ;  Default codecs config file. It replaces the old codecs.c file!
-;
 ;  Before editing this file, please read DOCS/tech/codecs.conf.txt !
 ;=============================================================================
 
@@ -8,53 +7,18 @@
 ;                   VIDEO CODECS
 ;=============================================================================
 
-; =============== Win32/libmpeg2/ProjectMayo MPEG CODECS =====================
+; mpeg 1/2 decoding:
+; Note: mpegpes is preferred for hw decoders:
 
-videocodec vivo
-  info "Vivo H.263"
-  status working
-  fourcc VIVO,vivo vivo
-  fourcc viv1,viv2 vivo
-  driver vfw
-  dll "ivvideo.dll"
-  out BGR32,BGR24,BGR15 flip
-  in BGR24
-  cpuflags mmx
-
-videocodec u263
-  info "UB Video H.263+ Decoder"
-  comment "added by Juanjo"
-  status working
-  fourcc U263
-  fourcc vivo,VIVO U263
-  fourcc viv1 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
-  cpuflags mmx
-
-videocodec divxds
-  info "DivX ;-) (MS MPEG-4 v3)"
-  comment "with postprocessing"
+videocodec mpegpes
+  info "Mpeg PES output (.mpg or DVB card)"
+  comment "for hardware decoding"
   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
-  cpuflags mmx
+  format 0x10000001  ; mpeg 1
+  format 0x10000002  ; mpeg 2
+  driver libmpeg2
+  dll "libmpeg2"
+  out MPES
 
 videocodec mpeg12
   info "MPEG 1 or 2"
@@ -66,47 +30,206 @@ videocodec mpeg12
   dll "libmpeg2"
   out YV12
 
-videocodec mpeg4ds
-  info "Microsoft MPEG-4 v1/v2"
+videocodec ffmpeg12
+  info "FFmpeg-1"
   status working
-  comment "with postprocessing"
-  fourcc DIV2,div2 mp42
-  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
-  fourcc MPG4,mpg4
-  fourcc MP42,mp42
-  driver dshow
-  dll "mpg4ds32.ax"
-  guid 0x82CCD3E0, 0xF71A, 0x11D0, 0x9F, 0xE5, 0x00, 0x60, 0x97, 0x78, 0xEA, 0x66
+  format 0x10000001  ; mpeg 1
+  format 0x10000002  ; mpeg 2
+  fourcc mpg1,mpg2
+  fourcc PIM1
+  driver ffmpeg
+  dll "mpegvideo"
+  out YV12
+
+; we have only native opensource codecs for these:
+
+videocodec nuv
+  info "NuppelVideo"
+  status working
+  fourcc NUV1
+  driver nuv
+  out I420
+
+videocodec mpng
+  info "mPNG codec"
+  status working
+  comment "Gray scaled PNG with Alpha channel not supported"
+  fourcc mpng,MPNG
+  driver mpng
+  out BGR32,BGR24
+
+videocodec fli
+  info "Autodesk FLI/FLC Animation"
+  status working
+  comment "FLIC is an internal MPlayer FOURCC"
+  fourcc FLIC
+  driver fli
+  out BGR32,BGR24
+
+videocodec qtrle
+  info "Quicktime Animation (RLE)"
+  status working
+; codec fourcc = "rle "
+  format 0x20656C72
+  driver qtrle
+  out BGR32,BGR24
+
+videocodec qtrpza
+  info "Quicktime Apple Video"
+  status working
+  fourcc rpza,azpr
+  driver qtrpza
+  out BGR32,BGR24,BGR15
+
+videocodec qtsmc
+  info "Apple Graphics (SMC) codec"
+  status working
+; codec fourcc = "smc "
+  format 0x20636d73
+  driver qtsmc
+  out BGR32,BGR24
+
+videocodec cyuv
+  info "Creative YUV (native codec)"
+  status working
+  fourcc cyuv,CYUV
+  driver cyuv
   out YUY2
+  out UYVY
+
+videocodec msrle
+  info "Microsoft RLE"
+  status working
+  format 0x1
+  format 0x2
+  driver msrle
   out BGR32,BGR24,BGR16,BGR15
-  cpuflags mmx
 
-videocodec mpeg4
-  info "Microsoft MPEG-4 v1/v2"
+videocodec roqvideo
+  info "Id RoQ File Video Decoder"
+  status buggy
+  comment "RoQV is an internal MPlayer FOURCC"
+  fourcc RoQV
+  driver roqvideo
+  out YV12
+
+; prefer native codecs over win32?
+; the win32 codecs probably are (better) optimized and support direct
+; rendering, so this may be not the best idea...
+
+;WIN32:
+
+videocodec cram
+  info "Microsoft Video 1"
+  comment "Input bpp = output bpp (8bpp is only supported by vo_ggi)"
   status working
-  fourcc MPG4,mpg4
-  fourcc MP42,mp42
-  fourcc DIV2 mp42
+  fourcc cram,CRAM CRAM
+  fourcc msvc,MSVC CRAM
+  fourcc wham,WHAM CRAM
   driver vfw
-  dll "mpg4c32.dll"
-  out YUY2 yuvhack
-  out BGR32,BGR24,BGR15
+  dll "msvidc32.dll"
+  out BGR8,BGR15,BGR24
+
+videocodec cvidvfw
+  info "Cinepak Video"
+  status working
+  fourcc cvid
+  driver vfw
+  dll "iccvid.dll"
+;  out YUY2
+;  out UYVY
+  out BGR24,BGR15
   cpuflags mmx
 
-videocodec divx
-  info "DivX ;-) (MS MPEG-4 v3)"
+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
+
+;NATIVE:
+
+videocodec video1
+  info "Microsoft Video 1"
+  status working
+  fourcc cram,CRAM
+  fourcc msvc,MSVC
+  fourcc wham,WHAM
+  driver msvidc
+  out BGR32,BGR24
+
+videocodec cvid
+  info "Cinepak Video (native codec)"
   status working
+  fourcc cvid,CVID
+  driver cinepak
+  out YV12
+  out YUY2
+  out BGR32,BGR24
+
+videocodec mphuffyuv
+  info "HuffYUV Mplayer Native Decoder"
+  status buggy
+  fourcc HFYU
+  driver huffyuv
+  out YUY2
+  out BGR32,BGR24
+
+;XAnim (slow):
+
+videocodec cvidxa
+  info "Radius Cinepak Video"
+  status working
+  fourcc cvid
+  driver xanim
+  dll "vid_cvid.xa"
+  out YV12,IYUV,I420
+
+videocodec cyuvxa
+  info "Creative CYUV"
+  status untested
+  fourcc CYUV,cyuv
+  driver xanim
+  dll "vid_cyuv.xa"
+  out YV12,IYUV,I420
+
+; time to decide what to do with the mpeg4/divx variants...
+; ff* is fastest...
+
+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 vfw
-  dll "divxc32.dll"
-  out YUY2 yuvhack
-  out BGR32,BGR24,BGR15
-  cpuflags mmx
-  
+  driver ffmpeg
+  dll msmpeg4
+  out YV12
+
+videocodec ffodivx
+  info "FFmpeg OpenDivX"
+  status working
+  fourcc DIVX,divx
+  fourcc DIV1,div1 divx
+  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
+  fourcc xvid,XVID,XviD
+  fourcc DX50
+  fourcc mp4v
+  format 0x4
+  driver ffmpeg
+  dll mpeg4 ;opendivx
+  out YV12
+
+; divx4 does direct render, and is native on linux
+
 videocodec odivx
   info "OpenDivX (MPEG-4 v2)"
   comment "with postprocessing"
@@ -143,6 +266,8 @@ videocodec divx4
   out UYVY
   out BGR32,BGR24,BGR16,BGR15
 
+; is divx4vfw stable enough, working everywhere and faster than divxds?
+
 videocodec divx4vfw
   info "DivX4Windows-VFW (DivX 3.x, DivX4)"
   status working
@@ -160,19 +285,95 @@ videocodec divx4vfw
   out BGR32,BGR24,BGR15
   cpuflags mmx
 
-videocodec i263
-  info "I263"
+; the original ones...  prefer DShow for postprocessing:
+
+videocodec divxds
+  info "DivX ;-) (MS MPEG-4 v3)"
+  comment "with postprocessing"
   status working
-  fourcc I263,i263,I420,i420
-  fourcc vivo,VIVO I263
-  fourcc viv1 I263
+  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
+  cpuflags mmx
+
+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 "i263_32.drv"
-;  out I420
+  dll "divxc32.dll"
+  out YUY2 yuvhack
+  out BGR32,BGR24,BGR15
+  cpuflags mmx
+  
+; hmm. we should check, maybe these are/will be playable with libavcodec:
+
+videocodec mpeg4ds
+  info "Microsoft MPEG-4 v1/v2"
+  status working
+  comment "with postprocessing"
+  fourcc DIV2,div2 mp42
+  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
+  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
+  cpuflags mmx
+
+videocodec mpeg4
+  info "Microsoft MPEG-4 v1/v2"
+  status working
+  fourcc MPG4,mpg4
+  fourcc MP42,mp42
+  fourcc DIV2 mp42
+  driver vfw
+  dll "mpg4c32.dll"
+  out YUY2 yuvhack
   out BGR32,BGR24,BGR15
   cpuflags mmx
 
+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
+  cpuflags mmx
+
+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
+  cpuflags mmx
+
+; mjpegs:
+; Notes: m3jpeg+mjpeg are mmx optimized. avid is very stable but slow.
+; ijpg only decodes jpeg images (no mjpg), and slow. ffmjpeg is buggy.
+
 videocodec m3jpeg
   info "Morgan Motion JPEG Codec"
   status working
@@ -199,8 +400,25 @@ videocodec mjpeg
   out BGR32,BGR24,BGR15
   cpuflags mmx
 
+videocodec avid
+  info "AVID"
+  status working
+  fourcc AVRn
+  fourcc AVDJ AVRn
+  fourcc MJPG,mjpg AVRn
+  driver vfw
+  dll "AvidAVICodec.dll"
+  out BGR24 flip
 
-; =============== FFMPEG MPEG CODECS =========================
+videocodec ijpg
+  info "IJPG codec"
+  status working
+  comment "Hm."
+  fourcc ijpg,IJPG
+  fourcc jpeg       ; MOV Photo Jpeg
+  fourcc AVRn,AVDJ  ; AVID
+  driver ijpg
+  out BGR24,BGR8
 
 videocodec ffmjpeg
   info "FFmpeg MJPEG decoder"
@@ -213,6 +431,60 @@ videocodec ffmjpeg
 ;  out YUY2
   out YV12
 
+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
+
+; h263: - I don't know. comments?
+
+videocodec vivo
+  info "Vivo H.263"
+  status working
+  fourcc VIVO,vivo vivo
+  fourcc viv1,viv2 vivo
+  driver vfw
+  dll "ivvideo.dll"
+  out BGR32,BGR24,BGR15 flip
+  in BGR24
+  cpuflags mmx
+
+videocodec u263
+  info "UB Video H.263+ Decoder"
+  comment "added by Juanjo"
+  status working
+  fourcc U263
+  fourcc vivo,VIVO U263
+  fourcc viv1 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
+  cpuflags mmx
+
+videocodec i263
+  info "I263"
+  status working
+  fourcc I263,i263,I420,i420
+  fourcc vivo,VIVO I263
+  fourcc viv1 I263
+  driver vfw
+  dll "i263_32.drv"
+;  out I420
+  out YUY2
+  out BGR32,BGR24,BGR15
+  cpuflags mmx
+
 videocodec ffi263
   info "FFmpeg I263 decoder"
   status working
@@ -230,231 +502,36 @@ videocodec ffh263
   dll h263
   out YV12
 
-videocodec ffrv10
-  info "FFmpeg RV10 decoder"
-  status working
-  fourcc RV10,rv10
-  fourcc RV13,rv13
-  driver ffmpeg
-  dll rv10
-  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
-  fourcc DIVX,divx
-  fourcc DIV1,div1 divx
-  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
-  fourcc xvid,XVID,XviD
-  fourcc DX50
-  fourcc mp4v
-  format 0x4
-  driver ffmpeg
-  dll mpeg4 ;opendivx
-  out YV12
-
-videocodec ffmpeg12
-  info "FFmpeg-1"
-  status working
-  format 0x10000001  ; mpeg 1
-  format 0x10000002  ; mpeg 2
-  fourcc mpg1,mpg2
-  fourcc PIM1
-  driver ffmpeg
-  dll "mpegvideo"
-  out YV12
-
-videocodec mpegpes
-  info "Mpeg PES output (.mpg or DVB card)"
-  comment "for hardware decoding"
-  status working
-  format 0x10000001  ; mpeg 1
-  format 0x10000002  ; mpeg 2
-  driver libmpeg2
-  dll "libmpeg2"
-  out MPES
-
-; ============== MPLAYER OPENSOURCE CODECS =========
-
-videocodec cvid
-  info "Cinepak Video (native codec)"
-  status working
-  fourcc cvid,CVID
-  driver cinepak
-  out YV12
-  out YUY2
-  out BGR32,BGR24
-
-videocodec msrle
-  info "Microsoft RLE"
-  status working
-  format 0x1
-  format 0x2
-  driver msrle
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec fli
-  info "Autodesk FLI/FLC Animation"
-  status working
-  comment "FLIC is an internal MPlayer FOURCC"
-  fourcc FLIC
-  driver fli
-  out BGR32,BGR24
-
-videocodec video1
-  info "Microsoft Video 1"
-  status working
-  fourcc cram,CRAM
-  fourcc msvc,MSVC
-  fourcc wham,WHAM
-  driver msvidc
-  out BGR32,BGR24
-
-videocodec qtrle
-  info "Quicktime Animation (RLE)"
-  status working
-; codec fourcc = "rle "
-  format 0x20656C72
-  driver qtrle
-  out BGR32,BGR24
-
-videocodec nuv
-  info "NuppelVideo"
-  status working
-  fourcc NUV1
-  driver nuv
-  out I420
-
-videocodec cyuv
-  info "Creative YUV (native codec)"
-  status working
-  fourcc cyuv,CYUV
-  driver cyuv
-  out YUY2
-  out UYVY
-
-videocodec qtsmc
-  info "Apple Graphics (SMC) codec"
-  status working
-; codec fourcc = "smc "
-  format 0x20636d73
-  driver qtsmc
-  out BGR32,BGR24
-
-videocodec ducktm1
-  info "Duck Truemotion v1"
-  status buggy
-  fourcc DUCK
-  driver ducktm1
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec mpng
-  info "mPNG codec"
-  status working
-  comment "Gray scaled PNG with Alpha channel not supported"
-  fourcc mpng,MPNG
-  driver mpng
-  out BGR32,BGR24
-
-videocodec ijpg
-  info "IJPG codec"
+videocodec h263xa
+  info "CCITT H.263"
   status working
-  comment "Hm."
-  fourcc ijpg,IJPG
-  fourcc jpeg       ; MOV Photo Jpeg
-  fourcc AVRn,AVDJ  ; AVID
-  driver ijpg
-  out BGR24,BGR8
+  fourcc H263,h263
+  fourcc viv1 H263
+  fourcc VIVO,vivo H263
+  driver xanim
+  dll "vid_h263.xa"
+  out YV12,IYUV,I420
 
-videocodec roqvideo
-  info "Id RoQ File Video Decoder"
-  status buggy
-  comment "RoQV is an internal MPlayer FOURCC"
-  fourcc RoQV
-  driver roqvideo
-  out YV12
+videocodec h261xa
+  info "CCITT H.261"
+  status untested
+  fourcc H261,h261
+  driver xanim
+  dll "vid_h261.xa"
+  out YV12,IYUV,I420
 
-videocodec qtrpza
-  info "Quicktime Apple Video"
-  status working
-  fourcc rpza,azpr
-  driver qtrpza
+videocodec m261
+  info "M261"
+  status untested
+  fourcc m261,M261
+  driver vfw
+  dll "msh261.drv"
   out BGR32,BGR24,BGR15
 
-videocodec mphuffyuv
-  info "HuffYUV Mplayer Native Decoder"
-  status buggy
-  fourcc HFYU
-  driver huffyuv
-  out YUY2
-  out BGR32,BGR24
-
-audiocodec imaadpcm
-  info "IMA ADPCM"
-  status working
-  format 0x11
-  format 0x34616d69  ; "ima4" (MOV files)
-  driver imaadpcm
-
-audiocodec msadpcm
-  info "MS ADPCM"
-  status working
-  format 0x2
-  driver msadpcm
-
-audiocodec dk4adpcm
-  info "Duck DK4 ADPCM (rogue format number)"
-  status working
-  comment "This format number was used by Duck Corp. but not officially registered with Microsoft"
-  format 0x61
-  driver dk4adpcm
-
-audiocodec dk3adpcm
-  info "Duck DK3 ADPCM (rogue format number)"
-  status working
-  comment "This format number was used by Duck Corp. but not officially registered with Microsoft"
-  format 0x62
-  driver dk3adpcm
-
-audiocodec roqaudio
-  info "Id RoQ File Audio Decoder"
-  status working
-  comment "RoQA is an internal MPlayer FOURCC"
-  fourcc RoQA
-  driver roqaudio
-
-audiocodec faad
-  info "AAC MPEG2/MPEG4 Audio"
-  status buggy
-  comment "Under developemnt by Atmos"
-  fourcc mp4a,MP4A
-  driver faad
-
-; =============== WINDOWS DLL's ==============
-
-videocodec vp3
-  info "On2 OpenSource VP3-Codec"
-  status working
-  comment "For SSE-systems use hacked dll from ftp://mplayerhq.hu/MPlayer/samples/drivers32/"
-  fourcc VP30,vp30,VP31,vp31
-  driver vfwex
-  dll "vp31vfw.dll"
-  out YUY2
-  out BGR32,BGR24,BGR15
-  cpuflags mmx
+; 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
+; Xanim codecs, tehy provide YV12, usefull for YUV display or encoding.
 
 videocodec indeo5ds
   info "Intel Indeo 5"
@@ -499,73 +576,32 @@ videocodec indeo3
   out BGR24,BGR15 flip
   cpuflags mmx
 
-videocodec cvidvfw
-  info "Cinepak Video"
-  status working
-  fourcc cvid
-  driver vfw
-  dll "iccvid.dll"
-;  out YUY2
-;  out UYVY
-  out BGR24,BGR15
-  cpuflags mmx
-
-videocodec cram
-  info "Microsoft Video 1"
-  comment "Input bpp = output bpp (8bpp is only supported by vo_ggi)"
+videocodec indeo5xa
+  info "Intel Indeo 5"
   status working
-  fourcc cram,CRAM CRAM
-  fourcc msvc,MSVC CRAM
-  fourcc wham,WHAM CRAM
-  driver vfw
-  dll "msvidc32.dll"
-  out BGR8,BGR15,BGR24
-
-videocodec vcr2
-  info "ATI VCR-2"
-  status crashing
-  comment "segfault"
-  fourcc VCR2
-  driver vfw
-  dll "ativcr2.dll"
-  out YUY2
-  out BGR32,BGR24,BGR15
-  cpuflags mmx
+  fourcc IV50,iv50
+  driver xanim
+  dll "vid_iv50.xa"
+  out YV12,IYUV,I420
 
-videocodec wmv7
-  info "Windows Media Video 7"
+videocodec indeo4xa
+  info "Intel Indeo 4.1"
   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
-  cpuflags mmx
+  fourcc IV41,iv41
+  driver xanim
+  dll "vid_iv41.xa"
+  out YV12,IYUV,I420
 
-videocodec wmv8
-  info "Windows Media Video 8"
+videocodec indeo3xa
+  info "Intel Indeo 3.1/3.2"
   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
-  cpuflags mmx
+  fourcc IV31,iv31
+  fourcc IV32,iv32
+  driver xanim
+  dll "vid_iv32.xa"
+  out YV12,IYUV,I420
 
-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
+; DV:  qdv is more stable...  (native libdv support coming soon)
 
 videocodec qdv
   info "Sony Digital Video (DV)"
@@ -591,48 +627,48 @@ videocodec mcdv
   out UYVY
   out BGR32,BGR24,BGR15
 
-videocodec morgands
-  info "Morgan MJPEG"
+; 3ivx:
+
+videocodec 3ivXxa
+  info "3ivX Delta 3.5"
+  status working
+  fourcc 3IV1
+  driver xanim
+  dll "vid_3ivX.xa"
+  out YV12,IYUV,I420
+
+videocodec 3ivX
+  info "3ivX Delta 3.5"
   status crashing
-  fourcc MJPG mjpg
+  fourcc 3IV1
   driver dshow
-  dll "M3JPEGdec.ax"
-  guid 0x6988b440, 0x8352, 0x11d3, 0x9b, 0xda, 0xca, 0x86, 0x73, 0x7c, 0x71, 0x68
+  dll "3ivxdmo.dll"
+  guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c
+  out YV12
   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
+; others:
 
-videocodec mszh
-  info "AVImszh"
-  status buggy
-  comment "24bpp only"
-  fourcc MSZH
-  driver vfw
-  dll "avimszh.dll"
-;  out YUY2
-;  out BGR32,BGR24,BGR15
-  out BGR24
+videocodec ffrv10
+  info "FFmpeg RV10 decoder"
+  status working
+  fourcc RV10,rv10
+  fourcc RV13,rv13
+  driver ffmpeg
+  dll rv10
+  out YV12
 
-videocodec zlib
-  info "AVIzlib"
-  status buggy
-  comment "24bpp only"
-  fourcc ZLIB
-  driver vfw
-  dll "avizlib.dll"
-;  out YUY2
-;  out BGR32,BGR24,BGR15
-  out BGR24
+videocodec vp3
+  info "On2 OpenSource VP3-Codec"
+  status working
+  comment "For SSE-systems use hacked dll from ftp://mplayerhq.hu/MPlayer/samples/drivers32/"
+  fourcc VP30,vp30,VP31,vp31
+  driver vfwex
+  dll "vp31vfw.dll"
+  out YUY2
+  out BGR32,BGR24,BGR15
+  cpuflags mmx
 
 videocodec mwv1
   info "Motion Wavelets"
@@ -646,14 +682,6 @@ videocodec mwv1
   out BGR32,BGR24,BGR15 flip
   cpuflags mmx
 
-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
@@ -678,14 +706,73 @@ videocodec asv1
   out BGR32,BGR24,BGR15 flip
   cpuflags mmx
 
-videocodec 3ivX
-  info "3ivX Delta 3.5"
+videocodec CJPG
+  info "CJPG"
+  status untested
+  fourcc CJPG
+  driver vfw
+  dll "CtWbJpg.DLL"
+  out YUY2
+  out UYVY
+  out BGR24,BGR15
+
+; buggy codecs:  (any volunteers for native rewrite?)
+
+videocodec zlib
+  info "AVIzlib"
+  status buggy
+  comment "24bpp only"
+  fourcc ZLIB
+  driver vfw
+  dll "avizlib.dll"
+;  out YUY2
+;  out BGR32,BGR24,BGR15
+  out BGR24
+
+videocodec mszh
+  info "AVImszh"
+  status buggy
+  comment "24bpp only"
+  fourcc MSZH
+  driver vfw
+  dll "avimszh.dll"
+;  out YUY2
+;  out BGR32,BGR24,BGR15
+  out BGR24
+
+videocodec alaris
+  info "Alaris VideoGramPiX"
+; http://www.alaris.com/movies/toocool.vgm
+; Martin Schuster <schuster@ap.univie.ac.at>
+  status buggy
+  comment "only produces strange patterns"
+  fourcc VGPX,VTLP VGPX
+  driver vfwex
+  dll "vgpix32d.dll"
+  out UYVY
+
+; non-working codecs:
+
+videocodec vcr2
+  info "ATI VCR-2"
   status crashing
-  fourcc 3IV1
+  comment "segfault"
+  fourcc VCR2
+  driver vfw
+  dll "ativcr2.dll"
+  out YUY2
+  out BGR32,BGR24,BGR15
+  cpuflags mmx
+
+videocodec tm20
+  info "TrueMotion 2.0"
+  status crashing
+  comment "segfault in the DLL"
+  fourcc TM20
   driver dshow
-  dll "3ivxdmo.dll"
-  guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c
-  out YV12
+  dll "tm20dec.ax"
+  guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84
+;  out UYVY
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
 
@@ -712,160 +799,13 @@ videocodec pim1
 ;  out YUY2
 ;  out BGR32,BGR24,BGR16,BGR15
 
-videocodec 3ivXqtx
-  info "3ivX Delta 3.5"
-  status crashing
-  fourcc 3IV1
-  driver vfw
-  dll "qtx/3ivx.qtx"
-  out YV12
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec alaris
-  info "Alaris VideoGramPiX"
-; http://www.alaris.com/movies/toocool.vgm
-; Martin Schuster <schuster@ap.univie.ac.at>
-  status buggy
-  comment "only produces strange patterns"
-  fourcc VGPX,VTLP VGPX
-  driver vfwex
-  dll "vgpix32d.dll"
-  out UYVY
-
-videocodec avid
-  info "AVID"
-  status working
-  fourcc AVRn
-  fourcc AVDJ AVRn
-  fourcc MJPG,mjpg AVRn
-  driver vfw
-  dll "AvidAVICodec.dll"
-  out BGR24 flip
-
-videocodec CJPG
-  info "CJPG"
-  status untested
-  fourcc CJPG
-  driver vfw
-  dll "CtWbJpg.DLL"
-  out YUY2
-  out UYVY
-  out BGR24,BGR15
-
-; =============== XANIM DLL's =============
-
-videocodec indeo5xa
-  info "Intel Indeo 5"
-  status working
-  fourcc IV50,iv50
-  driver xanim
-  dll "vid_iv50.xa"
-  out YV12,IYUV,I420
-
-videocodec indeo4xa
-  info "Intel Indeo 4.1"
-  status working
-  fourcc IV41,iv41
-  driver xanim
-  dll "vid_iv41.xa"
-  out YV12,IYUV,I420
-
-videocodec indeo3xa
-  info "Intel Indeo 3.1/3.2"
-  status working
-  fourcc IV31,iv31
-  fourcc IV32,iv32
-  driver xanim
-  dll "vid_iv32.xa"
-  out YV12,IYUV,I420
-
-videocodec cvidxa
-  info "Radius Cinepak Video"
-  status working
-  fourcc cvid
-  driver xanim
-  dll "vid_cvid.xa"
-  out YV12,IYUV,I420
-
-videocodec 3ivXxa
-  info "3ivX Delta 3.5"
-  status working
-  fourcc 3IV1
-  driver xanim
-  dll "vid_3ivX.xa"
-  out YV12,IYUV,I420
-
-videocodec h263xa
-  info "CCITT H.263"
-  status working
-  fourcc H263,h263
-  fourcc viv1 H263
-  fourcc VIVO,vivo H263
-  driver xanim
-  dll "vid_h263.xa"
-  out YV12,IYUV,I420
-
-videocodec h261xa
-  info "CCITT H.261"
-  status untested
-  fourcc H261,h261
-  driver xanim
-  dll "vid_h261.xa"
-  out YV12,IYUV,I420
-
-videocodec cyuvxa
-  info "Creative CYUV"
-  status untested
-  fourcc CYUV,cyuv
-  driver xanim
-  dll "vid_cyuv.xa"
-  out YV12,IYUV,I420
-
-; ============== RAW (uncompressed) and NULL CODECS =========
+; raw formats:  (now RGB formats are autodetected)
 
 ; 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
 
-videocodec rawyv12
-  info "RAW YV12"
-  comment "pre-postprocessing support"
-  status working
-  driver raw
-  format 0x0
-  format 0x20776172
-  fourcc yv12,YV12
-  out YV12
-
-videocodec rawi420
-  info "RAW I420"
-  status working
-  driver raw
-  format 0x0
-  format 0x20776172
-  fourcc i420,I420
-  out I420
-
-videocodec rawyuy2
-  info "RAW YUY2"
-  status working
-  driver raw
-  format 0x0
-  format 0x20776172
-  fourcc yuy2,YUY2
-  out YUY2
-
-videocodec rawuyvy
-  info "RAW UYVY"
-  status working
-  driver raw
-  format 0x0
-  format 0x20776172
-  fourcc uyvy,UYVY
-  out UYVY
-
 videocodec rawrgb32
   info "RAW RGB32"
   status working
@@ -911,6 +851,45 @@ videocodec rawbgr15
   format 0x4247520F
   out BGR15 flip
 
+videocodec rawyuy2
+  info "RAW YUY2"
+  status working
+  driver raw
+  format 0x0
+  format 0x20776172
+  fourcc yuy2,YUY2
+  out YUY2
+
+videocodec rawuyvy
+  info "RAW UYVY"
+  status working
+  driver raw
+  format 0x0
+  format 0x20776172
+  fourcc uyvy,UYVY
+  out UYVY
+
+videocodec rawyv12
+  info "RAW YV12"
+  comment "pre-postprocessing support"
+  status working
+  driver raw
+  format 0x0
+  format 0x20776172
+  fourcc yv12,YV12
+  out YV12
+
+videocodec rawi420
+  info "RAW I420"
+  status working
+  driver raw
+  format 0x0
+  format 0x20776172
+  fourcc i420,I420
+  out I420
+
+; NULL codec - for testing.
+
 videocodec null
   info "NULL codec (no decoding!)"
   status crashing
@@ -922,10 +901,52 @@ videocodec null
   out UYVY
   out BGR32,BGR24,BGR16,BGR15
 
+
 ;=============================================================================
 ;                   AUDIO CODECS
 ;=============================================================================
 
+audiocodec imaadpcm
+  info "IMA ADPCM"
+  status working
+  format 0x11
+  format 0x34616d69  ; "ima4" (MOV files)
+  driver imaadpcm
+
+audiocodec msadpcm
+  info "MS ADPCM"
+  status working
+  format 0x2
+  driver msadpcm
+
+audiocodec dk4adpcm
+  info "Duck DK4 ADPCM (rogue format number)"
+  status working
+  comment "This format number was used by Duck Corp. but not officially registered with Microsoft"
+  format 0x61
+  driver dk4adpcm
+
+audiocodec dk3adpcm
+  info "Duck DK3 ADPCM (rogue format number)"
+  status working
+  comment "This format number was used by Duck Corp. but not officially registered with Microsoft"
+  format 0x62
+  driver dk3adpcm
+
+audiocodec roqaudio
+  info "Id RoQ File Audio Decoder"
+  status working
+  comment "RoQA is an internal MPlayer FOURCC"
+  fourcc RoQA
+  driver roqaudio
+
+audiocodec faad
+  info "AAC MPEG2/MPEG4 Audio"
+  status buggy
+  comment "Under developemnt by Atmos"
+  fourcc mp4a,MP4A
+  driver faad
+
 audiocodec pcm
   info "Uncompressed PCM"
   status working