summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-16 00:56:35 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-16 00:56:35 +0000
commitd495a2823f233bec72c21391a2129b39d12aba5a (patch)
tree7d6cacb7a244f9764aa66ca0aead6e19a38c0322
parentadf53a4caa5258f5cff2d4c3495c344b2fb287ba (diff)
downloadmpv-d495a2823f233bec72c21391a2129b39d12aba5a.tar.bz2
mpv-d495a2823f233bec72c21391a2129b39d12aba5a.tar.xz
support for Sierra VMD video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20950 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 516b784193..762fb81be1 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1930,6 +1930,14 @@ videocodec fftiertexseq
dll "tiertexseqvideo"
out BGR8
+videocodec ffvmd
+ info "FFmpeg Sierra VMD video"
+ status working
+ fourcc VMDV
+ driver ffmpeg
+ dll "vmdvideo"
+ out BGR8
+
; raw formats: (now RGB formats are autodetected)
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 1b9fa7f5bc..0ef07e6a1f 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -85,6 +85,7 @@ const CodecTag mp_wav_tags[] = {
const CodecTag mp_bmp_tags[] = {
{ CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')},
{ CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')},
+ { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')},
{ 0, 0 },
};