Commit a273bbfb authored by Roberto Togni's avatar Roberto Togni
Browse files

MSZH and ZLIB decoder support

Experimental ZLIB encoder (not working yet)

Originally committed as revision 2693 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent fb966f99
...@@ -726,6 +726,8 @@ following image formats are supported: ...@@ -726,6 +726,8 @@ following image formats are supported:
@item FLIC video @tab @tab X @item FLIC video @tab @tab X
@item Duck TrueMotion v1 @tab @tab X @tab fourcc: DUCK @item Duck TrueMotion v1 @tab @tab X @tab fourcc: DUCK
@item VMD Video @tab @tab X @tab used in Sierra VMD files @item VMD Video @tab @tab X @tab used in Sierra VMD files
@item MSZH @tab @tab X @tab Part of LCL
@item ZLIB @tab X @tab X @tab Part of LCL, encoder experimental
@end multitable @end multitable
@code{X} means that the encoding (resp. decoding) is supported. @code{X} means that the encoding (resp. decoding) is supported.
......
...@@ -19,7 +19,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \ ...@@ -19,7 +19,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \
vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \ vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \
roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \ roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \
msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \ msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
smc.o parser.o flicvideo.o truemotion1.o vmdav.o smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o
ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB),yes)
ifeq ($(AMR_NB_FIXED),yes) ifeq ($(AMR_NB_FIXED),yes)
......
...@@ -73,6 +73,7 @@ void avcodec_register_all(void) ...@@ -73,6 +73,7 @@ void avcodec_register_all(void)
register_avcodec(&asv1_encoder); register_avcodec(&asv1_encoder);
register_avcodec(&asv2_encoder); register_avcodec(&asv2_encoder);
register_avcodec(&ffv1_encoder); register_avcodec(&ffv1_encoder);
register_avcodec(&zlib_encoder);
#endif /* CONFIG_ENCODERS */ #endif /* CONFIG_ENCODERS */
register_avcodec(&rawvideo_encoder); register_avcodec(&rawvideo_encoder);
register_avcodec(&rawvideo_decoder); register_avcodec(&rawvideo_decoder);
...@@ -142,6 +143,8 @@ void avcodec_register_all(void) ...@@ -142,6 +143,8 @@ void avcodec_register_all(void)
register_avcodec(&truemotion1_decoder); register_avcodec(&truemotion1_decoder);
register_avcodec(&vmdvideo_decoder); register_avcodec(&vmdvideo_decoder);
register_avcodec(&vmdaudio_decoder); register_avcodec(&vmdaudio_decoder);
register_avcodec(&mszh_decoder);
register_avcodec(&zlib_decoder);
#ifdef CONFIG_AC3 #ifdef CONFIG_AC3
register_avcodec(&ac3_decoder); register_avcodec(&ac3_decoder);
#endif #endif
......
...@@ -91,6 +91,8 @@ enum CodecID { ...@@ -91,6 +91,8 @@ enum CodecID {
CODEC_ID_TRUEMOTION1, CODEC_ID_TRUEMOTION1,
CODEC_ID_VMDVIDEO, CODEC_ID_VMDVIDEO,
CODEC_ID_VMDAUDIO, CODEC_ID_VMDAUDIO,
CODEC_ID_MSZH,
CODEC_ID_ZLIB,
/* various pcm "codecs" */ /* various pcm "codecs" */
CODEC_ID_PCM_S16LE, CODEC_ID_PCM_S16LE,
...@@ -1624,6 +1626,7 @@ extern AVCodec asv2_encoder; ...@@ -1624,6 +1626,7 @@ extern AVCodec asv2_encoder;
extern AVCodec vcr1_encoder; extern AVCodec vcr1_encoder;
extern AVCodec ffv1_encoder; extern AVCodec ffv1_encoder;
extern AVCodec mdec_encoder; extern AVCodec mdec_encoder;
extern AVCodec zlib_encoder;
extern AVCodec h263_decoder; extern AVCodec h263_decoder;
extern AVCodec mpeg4_decoder; extern AVCodec mpeg4_decoder;
...@@ -1687,6 +1690,8 @@ extern AVCodec flic_decoder; ...@@ -1687,6 +1690,8 @@ extern AVCodec flic_decoder;
extern AVCodec vmdvideo_decoder; extern AVCodec vmdvideo_decoder;
extern AVCodec vmdaudio_decoder; extern AVCodec vmdaudio_decoder;
extern AVCodec truemotion1_decoder; extern AVCodec truemotion1_decoder;
extern AVCodec mszh_decoder;
extern AVCodec zlib_decoder;
extern AVCodec ra_144_decoder; extern AVCodec ra_144_decoder;
extern AVCodec ra_288_decoder; extern AVCodec ra_288_decoder;
extern AVCodec roq_dpcm_decoder; extern AVCodec roq_dpcm_decoder;
......
...@@ -155,6 +155,8 @@ const CodecTag codec_bmp_tags[] = { ...@@ -155,6 +155,8 @@ const CodecTag codec_bmp_tags[] = {
{ CODEC_ID_MSVIDEO1, MKTAG('w', 'h', 'a', 'm') }, { CODEC_ID_MSVIDEO1, MKTAG('w', 'h', 'a', 'm') },
{ CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') },
{ CODEC_ID_TRUEMOTION1, MKTAG('D', 'U', 'C', 'K') }, { CODEC_ID_TRUEMOTION1, MKTAG('D', 'U', 'C', 'K') },
{ CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') },
{ CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
{ 0, 0 }, { 0, 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