1 files changed, 63 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 9447901d4c..5f3d13dff2 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -718,6 +718,7 @@ videocodec ffdivx
   fourcc DIV5,div5 div3   ; DivX 3.20
   fourcc DIV6,div6 div4   ;   -||-
   fourcc DIV3,div3,DIV4,div4
+  fourcc DIVF,divf    ; divx4.12
   fourcc AP41 div3        ; AngelPotion stuff
   fourcc COL1,col1,COL0,col0 ; Cool codec (based on mpg4ds32.ax)
   fourcc 3IVD,3ivd    ; divxdoctored files (3ivx.com)
@@ -1094,6 +1095,7 @@ videocodec ffmjpeg
   fourcc MJLS       ; JPEG-LS custom FOURCC for avi - encoder
   fourcc MMJP,QIVG
   fourcc ACDV       ; ACDSee jpeg
+  fourcc SLMJ       ; SL M-JPEG
   driver ffmpeg
   dll mjpeg
   out 444P
@@ -1240,6 +1242,30 @@ videocodec pegasusmwv
   dll "pvwv220.dll"
   out BGR24 flip
 
+videocodec frwuvfw
+  info "Forward Uncompressed Video Codec"
+  status working
+  fourcc FRWU
+  driver vfw
+  dll "FRWU.dll"
+  out BGR24 flip
+
+videocodec frwdvfw
+  info "Forward JPEG Video Codec"
+  status working
+  fourcc FRWD
+  driver vfw
+  dll "FRWD.dll"
+  out BGR24 flip
+
+videocodec frwtvfw
+  info "Forward JPEG+Alpha Video"
+  status working
+  fourcc FRWT
+  driver vfw
+  dll "FRWT.dll"
+  out BGR24 flip
+
 ; h263: - I don't know. comments?
 
 videocodec vivo
@@ -1691,6 +1717,22 @@ videocodec psiv
   dll "psiv.dll"
   out BGR32,BGR24 query,flip
 
+videocodec nsvideo
+  info "Power VideoWorks video"
+  status working
+  fourcc NSVI
+  driver vfw
+  dll "nsvideo.dll"
+  out BGR24 flip
+
+videocodec smv2vfw
+  info "DideoNET SMV2"
+  status working
+  fourcc SMV2
+  driver vfw
+  dll "smv2vfw.dll"
+  out BGR32,BGR24,BGR8,RGB32,RGB24,RGB8 flip
+
 videocodec canopushq
   status working
   info "Canopus HQ Codec"
@@ -3260,6 +3302,13 @@ audiocodec ffxandpcm
   driver ffmpeg
   dll xan_dpcm
 
+audiocodec ffyamahaadpcm
+  info "FFmpeg Yamaha ADPCM audio"
+  status working
+  format 0x20
+  driver ffmpeg
+  dll adpcm_yamaha
+
 audiocodec ffadpcmthp
   info "FFmpeg THP ADPCM audio"
   status working
@@ -3403,6 +3452,13 @@ audiocodec divx
   driver acm
   dll "divxa32.acm"
 
+audiocodec vdowaveacm
+  info "vdowave ACM"
+  status working
+  format 0xFFFC
+  driver acm
+  dll "vdowave.acm"
+
 audiocodec msadpcmacm
   info "MS ADPCM"
   status working
@@ -3868,6 +3924,13 @@ audiocodec lhacm
   driver acm
   dll "lhacm.acm"
 
+audiocodec pscelp
+  info "Philips Speech Processing CELP"
+  status working
+  format 0x120
+  driver acm
+  dll "smcelp32.acm"
+
 audiocodec TwinVQ
   info "VQF codec by NTTLabs"
   status working