Commit 77f9c4b7 authored by Paul B Mahol's avatar Paul B Mahol

avocdec: add MagicYUV decoder

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent d0388bd3
...@@ -37,6 +37,7 @@ version <next>: ...@@ -37,6 +37,7 @@ version <next>:
- Direct Stream Transfer (DST) decoder - Direct Stream Transfer (DST) decoder
- loudnorm filter - loudnorm filter
- MTAF demuxer and decoder - MTAF demuxer and decoder
- MagicYUV decoder
version 3.0: version 3.0:
- Common Encryption (CENC) MP4 encoding and decoding support - Common Encryption (CENC) MP4 encoding and decoding support
......
...@@ -2387,6 +2387,7 @@ jv_decoder_select="blockdsp" ...@@ -2387,6 +2387,7 @@ jv_decoder_select="blockdsp"
lagarith_decoder_select="huffyuvdsp" lagarith_decoder_select="huffyuvdsp"
ljpeg_encoder_select="aandcttables idctdsp jpegtables" ljpeg_encoder_select="aandcttables idctdsp jpegtables"
loco_decoder_select="golomb" loco_decoder_select="golomb"
magicyuv_decoder_select="huffyuvdsp"
mdec_decoder_select="blockdsp idctdsp mpegvideo" mdec_decoder_select="blockdsp idctdsp mpegvideo"
metasound_decoder_select="lsp mdct sinewin" metasound_decoder_select="lsp mdct sinewin"
mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
......
...@@ -744,6 +744,7 @@ following image formats are supported: ...@@ -744,6 +744,7 @@ following image formats are supported:
@item LucasArts SANM/Smush @tab @tab X @item LucasArts SANM/Smush @tab @tab X
@tab Used in LucasArts games / SMUSH animations. @tab Used in LucasArts games / SMUSH animations.
@item lossless MJPEG @tab X @tab X @item lossless MJPEG @tab X @tab X
@item MagicYUV Lossless Video @tab @tab X
@item Microsoft ATC Screen @tab @tab X @item Microsoft ATC Screen @tab @tab X
@tab Also known as Microsoft Screen 3. @tab Also known as Microsoft Screen 3.
@item Microsoft Expression Encoder Screen @tab @tab X @item Microsoft Expression Encoder Screen @tab @tab X
......
...@@ -348,6 +348,7 @@ OBJS-$(CONFIG_LOCO_DECODER) += loco.o ...@@ -348,6 +348,7 @@ OBJS-$(CONFIG_LOCO_DECODER) += loco.o
OBJS-$(CONFIG_M101_DECODER) += m101.o OBJS-$(CONFIG_M101_DECODER) += m101.o
OBJS-$(CONFIG_MACE3_DECODER) += mace.o OBJS-$(CONFIG_MACE3_DECODER) += mace.o
OBJS-$(CONFIG_MACE6_DECODER) += mace.o OBJS-$(CONFIG_MACE6_DECODER) += mace.o
OBJS-$(CONFIG_MAGICYUV_DECODER) += magicyuv.o
OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o
OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \ OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \
twinvq.o twinvq.o
......
...@@ -219,6 +219,7 @@ void avcodec_register_all(void) ...@@ -219,6 +219,7 @@ void avcodec_register_all(void)
REGISTER_ENCODER(LJPEG, ljpeg); REGISTER_ENCODER(LJPEG, ljpeg);
REGISTER_DECODER(LOCO, loco); REGISTER_DECODER(LOCO, loco);
REGISTER_DECODER(M101, m101); REGISTER_DECODER(M101, m101);
REGISTER_DECODER(MAGICYUV, magicyuv);
REGISTER_DECODER(MDEC, mdec); REGISTER_DECODER(MDEC, mdec);
REGISTER_DECODER(MIMIC, mimic); REGISTER_DECODER(MIMIC, mimic);
REGISTER_ENCDEC (MJPEG, mjpeg); REGISTER_ENCDEC (MJPEG, mjpeg);
......
...@@ -406,6 +406,7 @@ enum AVCodecID { ...@@ -406,6 +406,7 @@ enum AVCodecID {
AV_CODEC_ID_CFHD, AV_CODEC_ID_CFHD,
AV_CODEC_ID_TRUEMOTION2RT, AV_CODEC_ID_TRUEMOTION2RT,
AV_CODEC_ID_M101, AV_CODEC_ID_M101,
AV_CODEC_ID_MAGICYUV,
/* various PCM "codecs" */ /* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
......
...@@ -1542,6 +1542,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1542,6 +1542,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0 Real Time"), .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0 Real Time"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
{
.id = AV_CODEC_ID_MAGICYUV,
.type = AVMEDIA_TYPE_VIDEO,
.name = "magicyuv",
.long_name = NULL_IF_CONFIG_SMALL("MagicYUV Lossless Video"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
},
/* various PCM "codecs" */ /* various PCM "codecs" */
{ {
......
This diff is collapsed.
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 43 #define LIBAVCODEC_VERSION_MINOR 44
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
...@@ -421,6 +421,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -421,6 +421,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_CFHD, MKTAG('C', 'F', 'H', 'D') }, { AV_CODEC_ID_CFHD, MKTAG('C', 'F', 'H', 'D') },
{ AV_CODEC_ID_M101, MKTAG('M', '1', '0', '1') }, { AV_CODEC_ID_M101, MKTAG('M', '1', '0', '1') },
{ AV_CODEC_ID_M101, MKTAG('M', '1', '0', '2') }, { AV_CODEC_ID_M101, MKTAG('M', '1', '0', '2') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', 'A', 'G', 'Y') },
{ AV_CODEC_ID_NONE, 0 } { AV_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