[MPlayer-cvslog] r36544 - trunk/etc/codecs.conf

[compn]

Author: compn
Date: Thu Dec 12 22:25:47 2013
New Revision: 36544

Log:
more binary codecs, patch by David Spreadborough

Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Wed Dec 11 21:03:03 2013	(r36543)
+++ trunk/etc/codecs.conf	Thu Dec 12 22:25:47 2013	(r36544)
@@ -186,12 +186,12 @@ videocodec imm6
 
 videocodec marchmpeg4
   info "March Networks MPEG4"
-  status untested
-  comment "decoder decodes xvid but we need mnm4 sample"
+  status working
+  comment "not standard mpeg4."
   fourcc MNM4
-  driver vfwex
+  driver vfw
   dll "mnmpeg4.dll"
-  out YUY2,UYVY flip
+  out RGB24,RGB32,BGR32,BGR24 flip
 
 videocodec amv2
   info "lossless video codec"
@@ -1961,6 +1961,14 @@ videocodec geoavc
   dll "GXAVC.dll"
   out BGR32,BGR24 flip
 
+videocodec fjhtvfw
+ info "FUJIAN HTC MPEG-4 CODEC"
+ status working
+ fourcc FJHT
+ driver vfw
+ dll "fjht264.dll"
+ out BGR15,BGR16,BGR24,BGR32,RGB16,RGB24,RGB32 flip
+
 ; MJPEG:
 ; Notes: m3jpeg+mjpeg are MMX optimized. avid is very stable but slow.
 ; ijpg only decodes JPEG images (no MJPEG), and slow.
@@ -3276,6 +3284,19 @@ videocodec webtrain
   dll "wtvc.dll"
   out BGR16 flip
 
+videocodec inmc
+  info "INMC"
+  status working
+  fourcc INMC
+  fourcc CFWL
+  fourcc IENP
+  fourcc IMP4
+  fourcc STM4
+  fourcc STS4
+  driver vfw
+  dll "MultiCodec.dll"
+  out BGR15,BGR16,BGR24,BGR32,RGB16,RGB24,RGB32 flip
+
 videocodec ficvvfw
   info "Mirillis Action screen capture codec"
   status working