From b441fdeb1557a65d12d14c6e928411f47ea59870 Mon Sep 17 00:00:00 2001 From: Yusuke Nakamura Date: Sat, 8 Jun 2013 23:23:16 +0900 Subject: [PATCH 1/2] utvideodec: Support ULH0 and ULH2 formats. Signed-off-by: Kostya Shishkov --- libavcodec/utvideodec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index cf9d2d8da7..129034b84a 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -516,6 +516,14 @@ static av_cold int decode_init(AVCodecContext *avctx) c->planes = 3; avctx->pix_fmt = AV_PIX_FMT_YUV422P; break; + case MKTAG('U', 'L', 'H', '0'): + c->planes = 3; + avctx->pix_fmt = AV_PIX_FMT_YUV420P; + break; + case MKTAG('U', 'L', 'H', '2'): + c->planes = 3; + avctx->pix_fmt = AV_PIX_FMT_YUV422P; + break; default: av_log(avctx, AV_LOG_ERROR, "Unknown Ut Video FOURCC provided (%08X)\n", avctx->codec_tag); From 2578f1efd64f4efc30114c328d1eff9030429e59 Mon Sep 17 00:00:00 2001 From: Yusuke Nakamura Date: Sat, 8 Jun 2013 23:54:41 +0900 Subject: [PATCH 2/2] riff: Support ULH0 and ULH2 fourccs. Signed-off-by: Kostya Shishkov --- libavformat/riff.c | 2 ++ 1 file changed, 2 insertions(+) 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') },