aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYusuke Nakamura <muken.the.vfrmaniac@gmail.com>2013-06-08 23:54:41 +0900
committerKostya Shishkov <kostya.shishkov@gmail.com>2013-06-10 09:37:53 +0200
commit2578f1efd64f4efc30114c328d1eff9030429e59 (patch)
tree1bb3a041194e0973c9c64665cd225e0ed62076a5
parentb441fdeb1557a65d12d14c6e928411f47ea59870 (diff)
downloadffmpeg-2578f1efd64f4efc30114c328d1eff9030429e59.tar.gz
riff: Support ULH0 and ULH2 fourccs.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
-rw-r--r--libavformat/riff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index a64e226527..b436a122d0 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -302,6 +302,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'G') },
{ AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '0') },
{ AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '2') },
+ { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'H', '0') },
+ { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'H', '2') },
{ AV_CODEC_ID_VBLE, MKTAG('V', 'B', 'L', 'E') },
{ AV_CODEC_ID_DXTORY, MKTAG('x', 't', 'o', 'r') },
{ AV_CODEC_ID_ZEROCODEC, MKTAG('Z', 'E', 'C', 'O') },