From 9b9b9f8002b57ca27e22e179a32f0a07a6e90b08 Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 16 Dec 2008 05:19:11 +0000
Subject: Added FOURCCS: RPZA,AZPR to ffrpza DVX3 to ffdivx INMC to ffodivx and
 xvid QIVG to ffmjpeg

Added binary codecs:
GMP4,GM40 to Geovision MPEG4
XJPG to Xiricam JPEG
SP60,SP61,SP62 to SP6x Codec
SMSV to WorldConnect Wavelet Codec


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28155 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 41 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

(limited to 'etc/codecs.conf')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index bb9a7a2329..4e5fd4617b 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -417,7 +417,7 @@ videocodec ffqtrle
 videocodec ffrpza
  info "QuickTime Apple Video"
  status working
- fourcc rpza,azpr
+ fourcc rpza,azpr,RPZA,AZPR
  driver ffmpeg
  dll "rpza"
  out BGR15
@@ -703,6 +703,7 @@ videocodec ffdivx
   fourcc AP41 div3        ; AngelPotion stuff
   fourcc COL1,col1,COL0,col0 ; Cool codec (based on mpg4ds32.ax)
   fourcc 3IVD,3ivd    ; divxdoctored files (3ivx.com)
+  fourcc DVX3
   driver ffmpeg
   dll msmpeg4
   out YV12,I420,IYUV
@@ -804,7 +805,7 @@ videocodec ffodivx
   fourcc FVFW,fvfw
   fourcc FFDS
   fourcc DCOD,MVXM,EM4A,PM4V
-  fourcc M4T3,DMK2,DIGI
+  fourcc M4T3,DMK2,DIGI,INMC
   driver ffmpeg
   dll mpeg4 ;opendivx
   out YV12,I420,IYUV
@@ -854,7 +855,7 @@ videocodec xvid
   fourcc VIDM ; vidm 4.01 codec
   fourcc FFDS
   fourcc DCOD,MVXM,EM4A,PM4V
-  fourcc M4T3,DMK2,DIGI
+  fourcc M4T3,DMK2,DIGI,INMC
   format 0x10000004  ; mpeg 4 es
   driver xvid
   out YV12
@@ -1038,6 +1039,13 @@ videocodec ubmp4
   out I420
   out UYVY
 
+videocodec geomp4
+  info "GeoVision Advanced MPEG-4"
+  status working
+  fourcc GMP4,GM40
+  driver vfw
+  dll "GXAMP4.dll"
+  out BGR24 flip
 
 ; MJPEG:
 ; Notes: m3jpeg+mjpeg are MMX optimized. avid is very stable but slow.
@@ -1066,7 +1074,7 @@ videocodec ffmjpeg
   fourcc LJPG       ; lossless JPEG
   fourcc dmb1       ; MJPEG by Matrox Rainbow Runner
   fourcc MJLS       ; JPEG-LS custom FOURCC for avi - encoder
-  fourcc MMJP
+  fourcc MMJP,QIVG
   fourcc ACDV       ; ACDSee jpeg
   driver ffmpeg
   dll mjpeg
@@ -1848,6 +1856,14 @@ videocodec CJPG
   out UYVY
   out BGR24,BGR15
 
+videocodec xjpg
+  info "xiricam Veo PC Camera"
+  status working
+  fourcc XJPG
+  driver vfw
+  dll "camfc.dll"
+  out BGR24 flip
+
 videocodec ffduck
   info "Duck Truemotion1"
   status working
@@ -1899,6 +1915,14 @@ videocodec ffsp5x
   dll "sp5x"
   out YV12
 
+videocodec sp6x
+  info "SP6x codec"
+  status buggy
+  fourcc SP60,SP61,SP62
+  driver vfw
+  dll "sp6x_32.dll"
+  out BGR24 flip
+
 videocodec sp5x
   info "SP5x codec - used by Aiptek MegaCam"
   status working
@@ -1972,6 +1996,15 @@ videocodec eyecon
   dll "nub2.dll"
   out YV12,YUY2
 
+videocodec smsvvfw
+  info "WorldConnect Wavelet Video"
+  comment "found in visualmail videos"
+  status working
+  fourcc SMSV
+  driver vfw
+  dll "wv32vfw.dll"
+  out BGR24 flip
+
 videocodec foxmotion
   info "fox motion video"
   status working
-- 
cgit v1.2.3