diff --git a/Changelog b/Changelog
index 2083d7ff33..3e50f7db97 100644
--- a/Changelog
+++ b/Changelog
@@ -7,6 +7,7 @@ MPlayer (1.0)
     * Support for DTS WAV/DTS-CD passthrough by ad_hwac3
     * Apple's raw YUV2 in MOV
     * LATM over LOAS AAC decoding via internal libfaad2
+    * Video game codecs: BFI video
 
     Demuxers:
     * -lavfdopts cryptokey allows decrypting MXF and ASF files
diff --git a/etc/codecs.conf b/etc/codecs.conf
index d9403c65a2..6537954035 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2095,6 +2095,14 @@ videocodec ffthp
   dll thp
   out YV12
 
+videocodec ffbfi
+  info "FFmpeg BFI Video"
+  status working
+  fourcc BFIV ; internal MPlayer FourCC
+  driver ffmpeg
+  dll bfi
+  out BGR8
+
 videocodec ffbethsoftvid
   info "FFmpeg Bethesda Software VID"
   comment "video plays much too fast"
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 106b74861a..10e1b55e0b 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -60,6 +60,7 @@ const struct AVCodecTag *mp_wav_override_taglists[] = {mp_wav_override_tags, 0};
 static const AVCodecTag mp_bmp_tags[] = {
     { CODEC_ID_AMV,               MKTAG('A', 'M', 'V', 'V')},
     { 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_DSICINVIDEO,       MKTAG('D', 'C', 'I', 'V')},
     { CODEC_ID_DXA,               MKTAG('D', 'X', 'A', '1')},