Merge commit '82b6e451161f19ab90bfb9565b710021caf5dcbd'

[ffmpeg] / libavformat / riff.c

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 0f0cb4bf3b0fdfa28d3421e6a0700e0353d61561..399523c777f2f5d3c0625975fef07f96fe5a5192 100644 (file)
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -365,6 +365,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { AV_CODEC_ID_PRORES,       MKTAG('A', 'P', 'C', 'N') },
     { AV_CODEC_ID_PRORES,       MKTAG('A', 'P', 'C', 'H') },
     { AV_CODEC_ID_QTRLE,        MKTAG('r', 'l', 'e', ' ') },
+    { AV_CODEC_ID_HQX,          MKTAG('C', 'H', 'Q', 'X') },
     { AV_CODEC_ID_NONE,         0 }
 };