diff options
| author | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-24 04:36:04 +0000 |
|---|---|---|
| committer | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-24 04:36:04 +0000 |
| commit | a0601ed2566d132fec57dcf163372f9f341f3c13 (patch) | |
| tree | 1a15ac81762f0bfc0297e8ee36c8d46095f7e136 | |
| parent | 8eaf81f67672d10fe7186901b1a0271796755f69 (diff) | |
| download | mpv-a0601ed2566d132fec57dcf163372f9f341f3c13.tar.bz2 mpv-a0601ed2566d132fec57dcf163372f9f341f3c13.tar.xz | |
create CDGR fourcc in mp_taglist and add ffcdgraphics to codecs.conf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30104 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 8 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.c | 1 |
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')}, |