diff --git a/etc/codecs.conf b/etc/codecs.conf
index c98fe965a3..ecab60558a 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -22,13 +22,13 @@ videocodec mpegpes
   out MPES
 
 videocodec mpeg12
-  info "MPEG 1 or 2"
+  info "MPEG 1 or 2 (libmpeg2)"
   comment "with postprocessing"
   status working
   format 0x10000001  ; mpeg 1
   format 0x10000002  ; mpeg 2
   driver libmpeg2
-  dll "libmpeg2"
+;  dll "libmpeg2"
   out YV12,I420,IYUV
 
 videocodec ffmpeg12
@@ -117,8 +117,8 @@ videocodec msrle
 videocodec roqvideo
   info "Id RoQ File Video Decoder"
   status buggy
-  comment "RoQV is an internal MPlayer FOURCC"
-  fourcc RoQV
+  comment "buggy"
+  fourcc RoQV ; RoQV is an internal MPlayer FOURCC
   driver roqvideo
   out YV12
 
@@ -318,6 +318,7 @@ videocodec xvid
   out UYVY
   out YVYU
   out BGR32,BGR24,BGR16,BGR15
+  dll "libxvidcore.a"
 
 ; divx4 does direct render, and is native on linux
 
@@ -335,7 +336,7 @@ videocodec odivx
   fourcc DX50,BLZ0 DX50
   format 0x4
   driver odivx
-  dll "libdivxdecore.0"
+  dll "libdivxdecore.so"
   out YV12,I420,IYUV
 
 videocodec divx4
@@ -352,7 +353,7 @@ videocodec divx4
   fourcc DX50,BLZ0 DX50
   format 0x4
   driver divx4
-  dll "libdivxdecore.0"
+  dll "libdivxdecore.so"
 ;  out I420 ; planar direct rendering
   out YUY2
   out UYVY
@@ -456,6 +457,7 @@ videocodec wmv7
 
 videocodec ubmp4
   info "UB Video MPEG 4"
+  comment "black&white"
   status buggy
   fourcc mp4v UMP4 ; black&white, sometimes buggy too
   fourcc UMP4
@@ -558,7 +560,7 @@ videocodec m3jpegds
 
 videocodec pegasusm
   info "Pegasus Motion JPEG"
-  status buggy
+  status crashing
   fourcc MJPG
   driver vfw
 ;  dll "pvmjpg20.dll"	; v2.0
@@ -567,7 +569,7 @@ videocodec pegasusm
 
 videocodec pegasusl
   info "Pegasus Lossless JPEG"
-  status buggy
+  status crashing
   fourcc JPGL
   fourcc MJPG JPGL
   driver vfw
@@ -576,7 +578,7 @@ videocodec pegasusl
 
 videocodec pegasusmwv
   info "Pegasus Motion Wavelet 2000"
-  status buggy
+  status crashing
   fourcc PVW2
   driver vfw
   dll "pvwv220.dll"
@@ -751,7 +753,7 @@ videocodec qdv
   out BGR24,BGR16,BGR15 ; BGR32 is buggy, at least with one sample
 
 videocodec ffdv
-  info "Raw DV decoder using libavcodec"
+  info "FFmpeg DV decoder"
   status working
   fourcc DVSD,dvsd   ; PAL
   fourcc DVCS,dvcs   ; NTSC ?
@@ -762,13 +764,14 @@ videocodec ffdv
   out 411P,YV12
 
 videocodec libdv
-  info "Raw DV decoder using libdv"
+  info "Raw DV decoder (libdv)"
   status working
   fourcc DVSD,dvsd   ; PAL
   fourcc DVCS,dvcs   ; NTSC ?
   fourcc "dvcp"      ; PAL DV in .mov
   fourcc "dvc "      ; NTSC DV in .mov
   driver libdv
+  dll libdv.so.2
   out YUY2
 
 ; note: it crashes with pond.dv :(
@@ -855,7 +858,7 @@ videocodec ffrv10
 videocodec vp3
   info "On2 OpenSource VP3-Codec"
   status working
-  comment "For SSE-systems use hacked 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
@@ -952,8 +955,10 @@ videocodec sp5x
 videocodec qtsvq3
   info "win32/quicktime SVQ3 decoder"
   status untested
+  comment "REQUIRES libwine, see DOCS/tech/qt-libwine-howto.txt"
   fourcc SVQ3
   driver qtvideo
+  dll "QuickTime.qts"
   out YUY2
 
 ; buggy codecs:  (any volunteers for native rewrite?)
@@ -1035,7 +1040,7 @@ videocodec rricm
 ; sample videos: http://www.techsmith.com/products/camtasia/examplevideos.asp
 videocodec camtasia
   info "TechSmith Camtasia Screen Codec"
-  status buggy
+  status working
   fourcc TSCC,tscc
   driver vfw
   dll "tsccvid.dll"
@@ -1195,6 +1200,7 @@ videocodec null
 audiocodec qdmc
   info "Quicktime QDMC/QDM2 audio decoders"
   status working
+  comment "REQUIRES libwine, see DOCS/tech/qt-libwine-howto.txt"
   format 0x324D4451 ; "QDM2"
   format 0x434D4451 ; "QDMC"
   driver qtaudio
@@ -1258,18 +1264,18 @@ audiocodec roqaudio
   driver roqaudio
 
 audiocodec libdv
-  info "raw DV audio decoder"
+  info "raw DV audio decoder (libdv)"
   status working
-  comment "raw DV audio decoder"
   fourcc RADV
   driver libdv
+  dll libdv.so.2
 
 audiocodec faad
   info "AAC MPEG2/MPEG4 Audio"
   status working
-  comment "Under developemnt by Atmos"
   fourcc mp4a,MP4A
   driver faad
+  dll libfaad2
 
 audiocodec pcm
   info "Uncompressed PCM"
@@ -1311,7 +1317,6 @@ audiocodec mp3
   format 0x33706d2e  ; ".mp3" CBR/VBR MP3 (MOV files)
   format 0x5500736d  ; "ms\0\x55" older mp3 fcc (MOV files)
   driver mp3lib
-  dll "mp3lib"
   flags seekable
 
 audiocodec ffwmav1
@@ -1343,7 +1348,8 @@ audiocodec ffmac6
   dll "mace6"
 
 audiocodec ffmp3
-  info "FFmpeg layer-3 audio decoder - integer only"
+  info "FFmpeg layer-3 audio decoder"
+  comment "integer only"
   status working
   format 0x55
   format 0x33706d2e  ; ".mp3" CBR/VBR MP3 (MOV files)
@@ -1353,7 +1359,8 @@ audiocodec ffmp3
   flags seekable
 
 audiocodec ffmp2
-  info "FFmpeg layer 1,2 audio decoder - integer only"
+  info "FFmpeg layer 1,2 audio decoder"
+  comment "integer only"
   status working
   format 0x50
   driver ffmpeg
@@ -1362,7 +1369,7 @@ audiocodec ffmp2
 
 ;MAD library
 audiocodec mad
-  info "libMAD MPEG layer 1,2,3"
+  info "libMAD MPEG layer 1-2-3"
   status working
   format 0x50
   format 0x55
@@ -1428,7 +1435,7 @@ audiocodec ulaw
   driver alaw
 
 audiocodec dvdpcm
-  info "Uncompressed DVD LPCM"
+  info "Uncompressed DVD/VOB LPCM"
   status working
   format 0x10001
   driver dvdpcm
@@ -1441,7 +1448,7 @@ audiocodec a52
   dll "liba52"
 
 audiocodec ac3
-  info "AC3"
+  info "AC3-libac3"
   comment "removed from mplayer, use liba52"
   status working
   format 0x2000
@@ -1510,6 +1517,7 @@ audiocodec g72x
 audiocodec atrac3
   info "Sony ATRAC3"
   status buggy
+  comment "format not accepted"
   format 0x270
   driver acm
   dll "atrac3.acm"