Commit 69254f46 authored by Paul B Mahol's avatar Paul B Mahol

LucasArts SMUSH video decoder

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent b1835732
...@@ -560,6 +560,8 @@ following image formats are supported: ...@@ -560,6 +560,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 Smush @tab @tab X
@ Used in LucasArts games
@item lossless MJPEG @tab X @tab X @item lossless MJPEG @tab X @tab X
@item Microsoft RLE @tab @tab X @item Microsoft RLE @tab @tab X
@item Microsoft Screen 1 @tab @tab X @item Microsoft Screen 1 @tab @tab X
......
...@@ -394,6 +394,7 @@ OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o rv30dsp.o rv34dsp.o \ ...@@ -394,6 +394,7 @@ 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 \
mpegvideo.o error_resilience.o mpegvideo.o error_resilience.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
......
...@@ -202,6 +202,7 @@ void avcodec_register_all(void) ...@@ -202,6 +202,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);
......
...@@ -269,6 +269,7 @@ enum CodecID { ...@@ -269,6 +269,7 @@ enum CodecID {
CODEC_ID_V308 = MKBETAG('V','3','0','8'), CODEC_ID_V308 = MKBETAG('V','3','0','8'),
CODEC_ID_V408 = MKBETAG('V','4','0','8'), CODEC_ID_V408 = MKBETAG('V','4','0','8'),
CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'), CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'),
CODEC_ID_SANM = MKBETAG('S','A','N','M'),
/* 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.
This diff is collapsed.
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
*/ */
#define LIBAVCODEC_VERSION_MAJOR 54 #define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR 28 #define LIBAVCODEC_VERSION_MINOR 29
#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, \
......
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