summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf32
-rw-r--r--libmpdemux/demux_lavf.c3
2 files changed, 35 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index dfc8d8285a..642cd235db 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1946,6 +1946,38 @@ videocodec ffdsicinvideo
dll "dsicinvideo"
out BGR8
+videocodec ffwc3
+ info "FFmpeg XAN wc3"
+ status buggy
+ fourcc WC3V ; internal MPlayer FourCC
+ driver ffmpeg
+ dll "xan_wc3"
+ out BGR8
+
+videocodec ffidcin
+ info "FFmpeg idcinvideo"
+ status buggy
+ fourcc IDCI ; internal MPlayer FourCC
+ driver ffmpeg
+ dll "idcinvideo"
+ out BGR8
+
+videocodec ffinterplay
+ info "FFmpeg Interplay Video"
+ status buggy
+ fourcc INPV ; internal MPlayer FourCC
+ driver ffmpeg
+ dll "interplayvideo"
+ out BGR8
+
+videocodec ffvqa
+ info "FFmpeg VQA Video"
+ status buggy
+ fourcc VQAV ; internal MPlayer FourCC
+ driver ffmpeg
+ dll "vqavideo"
+ out BGR8
+
; raw formats: (now RGB formats are autodetected)
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 8b2a4dd960..effdb27276 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -89,9 +89,12 @@ const CodecTag mp_wav_tags[] = {
const CodecTag mp_bmp_tags[] = {
{ CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')},
{ CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')},
+ { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')},
+ { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')},
{ CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')},
{ CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')},
{ CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')},
+ { CODEC_ID_WS_VQA, MKTAG('V', 'Q', 'A', 'V')},
{ CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')},
{ 0, 0 },
};