On Mon, 10 Mar 2014 18:00:53 +0100, Vittorio Giovara <[email protected]> wrote: > From: Paul B Mahol <[email protected]> > > Signed-off-by: Vittorio Giovara <[email protected]> > --- > doc/general.texi | 2 + > libavcodec/Makefile | 1 + > libavcodec/allcodecs.c | 1 + > libavcodec/avcodec.h | 1 + > libavcodec/sanm.c | 1307 > ++++++++++++++++++++++++++++++++++++++++++++++++ > libavcodec/sanm_data.h | 254 ++++++++++ > libavcodec/version.h | 4 +- > 7 files changed, 1568 insertions(+), 2 deletions(-) > create mode 100644 libavcodec/sanm.c > create mode 100644 libavcodec/sanm_data.h > > diff --git a/doc/general.texi b/doc/general.texi > index 6bc7fda..42f7b98 100644 > --- a/doc/general.texi > +++ b/doc/general.texi > @@ -575,6 +575,8 @@ following image formats are supported: > @item LCL (LossLess Codec Library) MSZH @tab @tab X > @item LCL (LossLess Codec Library) ZLIB @tab E @tab E > @item LOCO @tab @tab X > +@item LucasArts SANM @tab @tab X > + @ Used in LucasArts SMUSH animations. > @item lossless MJPEG @tab X @tab X > @item Microsoft ATC Screen @tab @tab X > @tab Also known as Microsoft Screen 3. > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index bd93a6f..568bfa3 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -317,6 +317,7 @@ OBJS-$(CONFIG_RV20_ENCODER) += rv20enc.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_S302M_DECODER) += s302m.o > +OBJS-$(CONFIG_SANM_DECODER) += sanm.o > OBJS-$(CONFIG_SGI_DECODER) += sgidec.o > OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o > OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > index ed6d7ff..7c53f4c 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -222,6 +222,7 @@ void avcodec_register_all(void) > REGISTER_DECODER(RV30, rv30); > REGISTER_DECODER(RV40, rv40); > REGISTER_DECODER(S302M, s302m); > + REGISTER_DECODER(SANM, sanm); > REGISTER_ENCDEC (SGI, sgi); > REGISTER_DECODER(SMACKER, smacker); > REGISTER_DECODER(SMC, smc); > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > index 244f47b..04df091 100644 > --- a/libavcodec/avcodec.h > +++ b/libavcodec/avcodec.h > @@ -284,6 +284,7 @@ enum AVCodecID { > AV_CODEC_ID_HNM4_VIDEO, > AV_CODEC_ID_HEVC, > AV_CODEC_ID_FIC, > + AV_CODEC_ID_SANM, > > /* various PCM "codecs" */ > AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the > start of audio codecs > diff --git a/libavcodec/sanm_data.h b/libavcodec/sanm_data.h > new file mode 100644 > index 0000000..3ab6322 > --- /dev/null > +++ b/libavcodec/sanm_data.h
Either merge this into the main file or make this a separate object. For some reason, data tables in headers make people do evil and unspeakable things. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
