summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-07 16:50:33 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-07 16:50:33 +0000
commit224fd95f9cb299e3264a6d6cab49684491bd55fd (patch)
tree079004c86bc099351ece56b4cbe1eb524498e77f
parent3e8e92dc2fa39e440189050fb082c0b0af1f3d35 (diff)
downloadmpv-224fd95f9cb299e3264a6d6cab49684491bd55fd.tar.bz2
mpv-224fd95f9cb299e3264a6d6cab49684491bd55fd.tar.xz
support for C93 video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22936 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--etc/codecs.conf8
-rw-r--r--libmpdemux/demux_lavf.c1
2 files changed, 9 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index e07fdcbbc2..8f90da19cf 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2035,6 +2035,14 @@ videocodec ffvqa
dll "vqavideo"
out BGR8
+videocodec ffc93
+ info "FFmpeg C93 Video"
+ status buggy
+ fourcc C93V ; internal MPlayer FourCC
+ driver ffmpeg
+ dll c93
+ out BGR8
+
; raw formats: (now RGB formats are autodetected)
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index f4e5acd9f2..8cee30b154 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -93,6 +93,7 @@ static const AVCodecTag mp_wav_tags[] = {
const struct AVCodecTag *mp_wav_taglists[] = {codec_wav_tags, mp_wav_tags, 0};
static const AVCodecTag mp_bmp_tags[] = {
+ { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')},
{ CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')},
{ CODEC_ID_DXA, MKTAG('D', 'X', 'A', '1')},
{ CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')},