# HG changeset patch
# User compn
# Date 1261629364 0
# Node ID 54002b08fc789a5c9503ee34173bf9862f722ee5
# Parent  3ed1741da09d33a29250eb459f33e666fd885cbd
create CDGR fourcc in mp_taglist and add ffcdgraphics to codecs.conf

diff -r 3ed1741da09d -r 54002b08fc78 etc/codecs.conf
--- a/etc/codecs.conf	Wed Dec 23 16:11:48 2009 +0000
+++ b/etc/codecs.conf	Thu Dec 24 04:36:04 2009 +0000
@@ -9,6 +9,14 @@
 ;                   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
diff -r 3ed1741da09d -r 54002b08fc78 libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Wed Dec 23 16:11:48 2009 +0000
+++ b/libmpdemux/mp_taglists.c	Thu Dec 24 04:36:04 2009 +0000
@@ -86,6 +86,7 @@
     { 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')},