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 cfcdf1de30..04ddb3be1a 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2130,6 +2130,14 @@ videocodec ffbethsoftvid
dll bethsoftvid
out BGR8
+videocodec ffrl2
+ info "FFmpeg RL2 decoder"
+ status working
+ fourcc RL2V ; internal MPlayer FourCC
+ driver ffmpeg
+ dll rl2
+ out BGR8
+
videocodec fftxd
info "FFmpeg Renderware TeXture Dictionary decoder"
status working
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 10e1b55e0b..5bcf739188 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -67,6 +67,7 @@ static const AVCodecTag mp_bmp_tags[] = {
{ 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_RL2, MKTAG('R', 'L', '2', 'V')},
{ CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')},
{ CODEC_ID_THP, MKTAG('T', 'H', 'P', 'V')},
{ CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')},