Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / riff.c

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 774a02f82dc82bfbc29caa39a10ffd1baf1742d3..80a44b07b4b05f5c6f9953c5bb8aa60e87922961 100644 (file)
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -298,7 +298,9 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { CODEC_ID_VBLE,         MKTAG('V', 'B', 'L', 'E') },
     { CODEC_ID_ESCAPE130,    MKTAG('E', '1', '3', '0') },
     { CODEC_ID_DXTORY,       MKTAG('x', 't', 'o', 'r') },
+    { CODEC_ID_ZEROCODEC,    MKTAG('Z', 'E', 'C', 'O') },
     { CODEC_ID_Y41P,         MKTAG('Y', '4', '1', 'P') },
+    { CODEC_ID_FLIC,         MKTAG('A', 'F', 'L', 'C') },
     { CODEC_ID_NONE,         0 }
 };