aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf43
1 files changed, 34 insertions, 9 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 823d70fce6..6b2be0fdeb 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -8,7 +8,7 @@
videocodec u263
info "UB Video H.263+ Decoder"
- comment "added by Juanjo"
+ comment "added by Juanjo (also working with VIVO)"
status working
fourcc U263
driver dshow
@@ -134,6 +134,14 @@ videocodec divx4vfw
out YUY2
out BGR32,BGR24,BGR15
+videocodec vivo
+ info "Vivo H.263"
+ status working
+ fourcc VIVO,vivo vivo
+ driver vfw
+ dll "ivvideo.dll"
+ out BGR32,BGR24,BGR16 flip
+
videocodec i263
info "I263"
status working
@@ -148,8 +156,7 @@ videocodec mjpeg
info "Motion JPEG"
status working
fourcc MJPG
- fourcc mjpa ; MOV files
- fourcc mjpb ; MOV files
+ fourcc mjpa,mjpb,mjpg MJPG ; MOV files
driver vfw
dll "mcmjpg32.dll"
; dll "m3jpeg32.dll"
@@ -157,6 +164,7 @@ videocodec mjpeg
out UYVY
out BGR32,BGR24,BGR15
+
; =============== FFMPEG MPEG CODECS =========================
videocodec ffmjpeg
@@ -294,7 +302,7 @@ videocodec cvid
videocodec cram
info "Microsoft Video 1"
- status crashing
+ status working
fourcc cram,CRAM,MSVC
driver vfw
dll "msvidc32.dll"
@@ -465,6 +473,16 @@ videocodec 3ivX
out YUY2
out BGR32,BGR24,BGR16,BGR15
+videocodec 3ivXqtx
+ info "3ivX Delta 3.5"
+ status buggy
+ fourcc 3IV1
+ driver vfw
+ dll "qtx/3ivx.qtx"
+ out YV12
+ out YUY2
+ out BGR32,BGR24,BGR16,BGR15
+
; =============== XANIM DLL's =============
videocodec indeo5xa
@@ -515,7 +533,6 @@ videocodec h263xa
driver xanim
dll "vid_h263.xa"
out YV12,IYUV,I420
- comment "only tested with one buggy movie"
videocodec h261xa
info "CCITT H.261"
@@ -533,6 +550,7 @@ videocodec cyuvxa
dll "vid_cyuv.xa"
out YV12,IYUV,I420
+
videocodec null
info "NULL codec (no decoding)"
status working
@@ -552,8 +570,8 @@ audiocodec pcm
info "Uncompressed PCM"
status working
format 0x1
- format 0x20776172 ; "raw " (MOV files, 8bit)
- format 0x736F7774 ; "twos" (MOV files, 16bit)
+ format 0x20776172 ; "raw " (MOV files)
+ format 0x736f7774 ; "twos" (MOV files)
;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3)
; format 0x6
; format 0x7
@@ -653,7 +671,6 @@ audiocodec alaw
info "aLaw"
status working
format 0x6
- format 0x77616c75 ; "ulaw" (MOV files)
driver alaw
dll "alaw"
@@ -661,7 +678,7 @@ audiocodec ulaw
info "uLaw"
status working
format 0x7
- format 0x77616c61 ; "ulaw" (MOV files)
+ format 0x77616c75 ; "ulaw" (MOV files)
driver alaw
dll "ulaw"
@@ -730,3 +747,11 @@ audiocodec ima4
format 0x34616d69 ; "ima4" (MOV files)
driver ima4
dll "ima4.c"
+
+audiocodec vivosiren
+ info "Vivo G.723/Siren Audio Codec"
+ status untested
+ format 0x111 ; vivo g.723
+ format 0x112 ; siren
+ driver acm
+ dll "vivog723.acm"