Commit a420ccd4 authored by Paul B Mahol's avatar Paul B Mahol Committed by Vittorio Giovara
Browse files

LucasArts SMUSH SANM video decoder


Signed-off-by: default avatarVittorio Giovara <vittorio.giovara@gmail.com>
parent 5f922043
...@@ -14,6 +14,7 @@ version <next>: ...@@ -14,6 +14,7 @@ version <next>:
- support encoding and decoding 4-channel SGI images - support encoding and decoding 4-channel SGI images
- support decoding 16-bit RLE SGI images - support decoding 16-bit RLE SGI images
- VP7 video decoder - VP7 video decoder
- LucasArts SMUSH SANM video decoder
version 10: version 10:
......
...@@ -616,6 +616,8 @@ following image formats are supported: ...@@ -616,6 +616,8 @@ following image formats are supported:
@item LCL (LossLess Codec Library) MSZH @tab @tab X @item LCL (LossLess Codec Library) MSZH @tab @tab X
@item LCL (LossLess Codec Library) ZLIB @tab E @tab E @item LCL (LossLess Codec Library) ZLIB @tab E @tab E
@item LOCO @tab @tab X @item LOCO @tab @tab X
@item LucasArts SANM @tab @tab X
@tab Used in LucasArts SMUSH animations.
@item lossless MJPEG @tab X @tab X @item lossless MJPEG @tab X @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.
......
...@@ -326,6 +326,7 @@ OBJS-$(CONFIG_RV20_ENCODER) += rv20enc.o ...@@ -326,6 +326,7 @@ OBJS-$(CONFIG_RV20_ENCODER) += rv20enc.o
OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o rv30dsp.o rv34dsp.o OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o rv30dsp.o rv34dsp.o
OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o rv34dsp.o rv40dsp.o OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o rv34dsp.o rv40dsp.o
OBJS-$(CONFIG_S302M_DECODER) += s302m.o OBJS-$(CONFIG_S302M_DECODER) += s302m.o
OBJS-$(CONFIG_SANM_DECODER) += sanm.o
OBJS-$(CONFIG_SGI_DECODER) += sgidec.o OBJS-$(CONFIG_SGI_DECODER) += sgidec.o
OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o
OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o
......
...@@ -226,6 +226,7 @@ void avcodec_register_all(void) ...@@ -226,6 +226,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(RV30, rv30); REGISTER_DECODER(RV30, rv30);
REGISTER_DECODER(RV40, rv40); REGISTER_DECODER(RV40, rv40);
REGISTER_DECODER(S302M, s302m); REGISTER_DECODER(S302M, s302m);
REGISTER_DECODER(SANM, sanm);
REGISTER_ENCDEC (SGI, sgi); REGISTER_ENCDEC (SGI, sgi);
REGISTER_DECODER(SMACKER, smacker); REGISTER_DECODER(SMACKER, smacker);
REGISTER_DECODER(SMC, smc); REGISTER_DECODER(SMC, smc);
......
...@@ -289,6 +289,7 @@ enum AVCodecID { ...@@ -289,6 +289,7 @@ enum AVCodecID {
AV_CODEC_ID_PAF_VIDEO, AV_CODEC_ID_PAF_VIDEO,
AV_CODEC_ID_EXR, AV_CODEC_ID_EXR,
AV_CODEC_ID_VP7, AV_CODEC_ID_VP7,
AV_CODEC_ID_SANM,
/* 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
......
...@@ -1106,6 +1106,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1106,6 +1106,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("On2 VP7"), .long_name = NULL_IF_CONFIG_SMALL("On2 VP7"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
{
.id = AV_CODEC_ID_SANM,
.type = AVMEDIA_TYPE_VIDEO,
.name = "sanm",
.long_name = NULL_IF_CONFIG_SMALL("LucasArts SANM video"),
.props = AV_CODEC_PROP_LOSSY,
},
/* image codecs */ /* image codecs */
{ {
......
This diff is collapsed.
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 43 #define LIBAVCODEC_VERSION_MINOR 44
#define LIBAVCODEC_VERSION_MICRO 0 #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, \
......
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