Commit 189157c3 authored by Kostya Shishkov's avatar Kostya Shishkov Committed by Diego Biurrun

Add ClearVideo decoder

Only I-frames are decoded for now.
Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent c55f2ae2
......@@ -14,6 +14,7 @@ version <next>:
- Cineform HD decoder
- VP9 superframe split/merge bitstream filters
- FM Screen Capture Codec decoder
- ClearVideo decoder (I-frames only)
version 12:
......
......@@ -703,6 +703,8 @@ following image formats are supported:
@tab Used in the game Cyberia from Interplay.
@item Interplay MVE video @tab @tab X
@tab Used in Interplay .MVE files.
@item Iterated Systems ClearVideo @tab @tab X
@tab I-frames only
@item Karl Morton's video codec @tab @tab X
@tab Codec used in Worms games.
@item Kega Game Video (KGV1) @tab @tab X
......
......@@ -183,6 +183,7 @@ OBJS-$(CONFIG_CDGRAPHICS_DECODER) += cdgraphics.o
OBJS-$(CONFIG_CDXL_DECODER) += cdxl.o
OBJS-$(CONFIG_CFHD_DECODER) += cfhd.o cfhddata.o
OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o
OBJS-$(CONFIG_CLEARVIDEO_DECODER) += clearvideo.o
OBJS-$(CONFIG_CLJR_DECODER) += cljrdec.o
OBJS-$(CONFIG_CLJR_ENCODER) += cljrenc.o
OBJS-$(CONFIG_CLLC_DECODER) += cllc.o canopus.o
......
......@@ -129,6 +129,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(CDXL, cdxl);
REGISTER_DECODER(CFHD, cfhd);
REGISTER_DECODER(CINEPAK, cinepak);
REGISTER_DECODER(CLEARVIDEO, clearvideo);
REGISTER_ENCDEC (CLJR, cljr);
REGISTER_DECODER(CLLC, cllc);
REGISTER_ENCDEC (COMFORTNOISE, comfortnoise);
......
......@@ -409,6 +409,7 @@ enum AVCodecID {
AV_CODEC_ID_PIXLET,
AV_CODEC_ID_CFHD,
AV_CODEC_ID_FMVC,
AV_CODEC_ID_CLEARVIDEO,
/* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
......
This diff is collapsed.
......@@ -1217,6 +1217,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("FM Screen Capture Codec"),
.props = AV_CODEC_PROP_LOSSLESS,
},
{
.id = AV_CODEC_ID_CLEARVIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.name = "clearvideo",
.long_name = NULL_IF_CONFIG_SMALL("Iterated Systems ClearVideo"),
.props = AV_CODEC_PROP_LOSSY,
},
/* image codecs */
{
......
......@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 2
#define LIBAVCODEC_VERSION_MINOR 3
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
......@@ -375,6 +375,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_AV1, MKTAG('A', 'V', '0', '1') },
{ AV_CODEC_ID_CFHD, MKTAG('C', 'F', 'H', 'D') },
{ AV_CODEC_ID_FMVC, MKTAG('F', 'M', 'V', 'C') },
{ AV_CODEC_ID_CLEARVIDEO, MKTAG('U', 'C', 'O', 'D') },
{ AV_CODEC_ID_NONE, 0 }
};
......
......@@ -43,5 +43,6 @@ const AVCodecTag ff_rm_codec_tags[] = {
{ AV_CODEC_ID_AAC, MKTAG('r','a','a','c') },
{ AV_CODEC_ID_AAC, MKTAG('r','a','c','p') },
{ AV_CODEC_ID_RALF, MKTAG('L','S','D',':') },
{ AV_CODEC_ID_CLEARVIDEO, MKTAG('C','L','V','1') },
{ AV_CODEC_ID_NONE },
};
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