[MPlayer-cvslog] r30104 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[compn]

Author: compn
Date: Thu Dec 24 05:36:04 2009
New Revision: 30104

Log:
add ff cd-graphics decoder, works on cdg sample

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Wed Dec 23 17:11:48 2009	(r30103)
+++ trunk/etc/codecs.conf	Thu Dec 24 05:36:04 2009	(r30104)
@@ -9,6 +9,14 @@ release 20090308
 ;                   VIDEO CODECS
 ;=============================================================================
 
+videocodec ffcdgraphics
+  info "FFmpeg CD-Graphics"
+  status working
+  fourcc CDGR ; internal MPlayer FourCC
+  driver ffmpeg
+  dll cdgraphics
+  out BGR8
+
 videocodec ffmvi1
   info "FFmpeg Motion Pixels"
   status working

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Wed Dec 23 17:11:48 2009	(r30103)
+++ trunk/libmpdemux/mp_taglists.c	Thu Dec 24 05:36:04 2009	(r30104)
@@ -86,6 +86,7 @@ static const AVCodecTag mp_bmp_tags[] = 
     { CODEC_ID_BETHSOFTVID,       MKTAG('B', 'E', 'T', 'H')},
     { CODEC_ID_BFI,               MKTAG('B', 'F', 'I', 'V')},
     { CODEC_ID_C93,               MKTAG('C', '9', '3', 'V')},
+    { CODEC_ID_CDGRAPHICS,        MKTAG('C', 'D', 'G', 'R')},
     { CODEC_ID_DNXHD,             MKTAG('A', 'V', 'd', 'n')},
     { CODEC_ID_DSICINVIDEO,       MKTAG('D', 'C', 'I', 'V')},
     { CODEC_ID_DXA,               MKTAG('D', 'X', 'A', '1')},