Commit 0d8506b8 authored by Kostya Shishkov's avatar Kostya Shishkov Committed by Anton Khirnov

Ut Video decoder

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent df3ca34a
...@@ -52,6 +52,7 @@ easier to use. The changes are: ...@@ -52,6 +52,7 @@ easier to use. The changes are:
- VC-1 interlaced decoding - VC-1 interlaced decoding
- lut, lutrgb, and lutyuv filters - lut, lutrgb, and lutyuv filters
- boxblur filter - boxblur filter
- Ut Video decoder
version 0.7: version 0.7:
......
...@@ -516,6 +516,7 @@ following image formats are supported: ...@@ -516,6 +516,7 @@ following image formats are supported:
@tab encoding supported through external library libtheora @tab encoding supported through external library libtheora
@item Tiertex Limited SEQ video @tab @tab X @item Tiertex Limited SEQ video @tab @tab X
@tab Codec used in DOS CD-ROM FlashBack game. @tab Codec used in DOS CD-ROM FlashBack game.
@item Ut Video @tab @tab X
@item V210 Quicktime Uncompressed 4:2:2 10-bit @tab X @tab X @item V210 Quicktime Uncompressed 4:2:2 10-bit @tab X @tab X
@item VMware Screen Codec / VMware Video @tab @tab X @item VMware Screen Codec / VMware Video @tab @tab X
@tab Codec used in videos captured by VMware. @tab Codec used in videos captured by VMware.
......
...@@ -378,6 +378,7 @@ OBJS-$(CONFIG_TTA_DECODER) += tta.o ...@@ -378,6 +378,7 @@ OBJS-$(CONFIG_TTA_DECODER) += tta.o
OBJS-$(CONFIG_TWINVQ_DECODER) += twinvq.o celp_math.o OBJS-$(CONFIG_TWINVQ_DECODER) += twinvq.o celp_math.o
OBJS-$(CONFIG_TXD_DECODER) += txd.o s3tc.o OBJS-$(CONFIG_TXD_DECODER) += txd.o s3tc.o
OBJS-$(CONFIG_ULTI_DECODER) += ulti.o OBJS-$(CONFIG_ULTI_DECODER) += ulti.o
OBJS-$(CONFIG_UTVIDEO_DECODER) += utvideo.o
OBJS-$(CONFIG_V210_DECODER) += v210dec.o OBJS-$(CONFIG_V210_DECODER) += v210dec.o
OBJS-$(CONFIG_V210_ENCODER) += v210enc.o OBJS-$(CONFIG_V210_ENCODER) += v210enc.o
OBJS-$(CONFIG_V210X_DECODER) += v210x.o OBJS-$(CONFIG_V210X_DECODER) += v210x.o
......
...@@ -199,6 +199,7 @@ void avcodec_register_all(void) ...@@ -199,6 +199,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (TSCC, tscc); REGISTER_DECODER (TSCC, tscc);
REGISTER_DECODER (TXD, txd); REGISTER_DECODER (TXD, txd);
REGISTER_DECODER (ULTI, ulti); REGISTER_DECODER (ULTI, ulti);
REGISTER_DECODER (UTVIDEO, utvideo);
REGISTER_ENCDEC (V210, v210); REGISTER_ENCDEC (V210, v210);
REGISTER_DECODER (V210X, v210x); REGISTER_DECODER (V210X, v210x);
REGISTER_DECODER (VB, vb); REGISTER_DECODER (VB, vb);
......
...@@ -212,6 +212,7 @@ enum CodecID { ...@@ -212,6 +212,7 @@ enum CodecID {
CODEC_ID_VC1IMAGE, CODEC_ID_VC1IMAGE,
CODEC_ID_G723_1, CODEC_ID_G723_1,
CODEC_ID_G729, CODEC_ID_G729,
CODEC_ID_UTVIDEO,
/* various PCM "codecs" */ /* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
......
This diff is collapsed.
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#define AVCODEC_VERSION_H #define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 53 #define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MINOR 12 #define LIBAVCODEC_VERSION_MINOR 13
#define LIBAVCODEC_VERSION_MICRO 2 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
......
...@@ -275,6 +275,10 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -275,6 +275,10 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, { CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') },
{ CODEC_ID_KGV1, MKTAG('K', 'G', 'V', '1') }, { CODEC_ID_KGV1, MKTAG('K', 'G', 'V', '1') },
{ CODEC_ID_LAGARITH, MKTAG('L', 'A', 'G', 'S') }, { CODEC_ID_LAGARITH, MKTAG('L', 'A', 'G', 'S') },
{ CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'A') },
{ CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'G') },
{ CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '0') },
{ CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '2') },
{ CODEC_ID_NONE, 0 } { CODEC_ID_NONE, 0 }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment