aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2011-10-16 20:22:59 -0400
committerMichael Niedermayer <michaelni@gmx.at>2011-10-17 23:44:12 +0200
commit1de357d6da3c4e4c1c47c8be182efbb4d4d8d7b4 (patch)
tree19d0161895c9ff68737683867b5877bcbf884555 /libavformat
parentfe87b2e79c734a111747a239943c7340f8d3f7d7 (diff)
downloadffmpeg-1de357d6da3c4e4c1c47c8be182efbb4d4d8d7b4.tar.gz
libutvideo: Add Ut Video Decoder Wrapper
Add a wrapper for libutvideo's decoder. This supports decoding the following FOURCCs: ULY0 - 4:2:0 YCbCr ULY2 - 4:2:2 YCbCr ULRG - RGB ULRA - RGBA Also, bump version. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/riff.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index e3fd639b9c..98f0824cea 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -281,6 +281,10 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_G2M, MKTAG('G', '2', 'M', '3') },
{ CODEC_ID_G2M, MKTAG('G', '2', 'M', '4') },
{ CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'F') },
+ { CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '0') },
+ { CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '2') },
+ { CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'G') },
+ { CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'A') },
{ CODEC_ID_NONE, 0 }
};