summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf8
-rw-r--r--libmpdemux/mp_taglists.c1
2 files changed, 9 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 4194c79b08..8f05bf9203 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -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
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 27cbe0c21d..34423d1c9f 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -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')},