Commit 791e7b83 authored by Michael Niedermayer's avatar Michael Niedermayer

my experimental wavelet codec

note, this is far from finished, dont expect todays encodings to be decodeable with cvs tomorrow ...

Originally committed as revision 3341 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 53e2f9ca
...@@ -20,7 +20,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \ ...@@ -20,7 +20,7 @@ OBJS= common.o utils.o mem.o allcodecs.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 lcl.o qtrle.o g726.o \ smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \
flac.o vp3dsp.o integer.o flac.o vp3dsp.o integer.o snow.o
ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB),yes)
ifeq ($(AMR_NB_FIXED),yes) ifeq ($(AMR_NB_FIXED),yes)
......
...@@ -77,6 +77,7 @@ void avcodec_register_all(void) ...@@ -77,6 +77,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(&snow_encoder);
register_avcodec(&zlib_encoder); register_avcodec(&zlib_encoder);
register_avcodec(&dvvideo_encoder); register_avcodec(&dvvideo_encoder);
#endif /* CONFIG_ENCODERS */ #endif /* CONFIG_ENCODERS */
...@@ -124,6 +125,7 @@ void avcodec_register_all(void) ...@@ -124,6 +125,7 @@ void avcodec_register_all(void)
register_avcodec(&mace6_decoder); register_avcodec(&mace6_decoder);
register_avcodec(&huffyuv_decoder); register_avcodec(&huffyuv_decoder);
register_avcodec(&ffv1_decoder); register_avcodec(&ffv1_decoder);
register_avcodec(&snow_decoder);
register_avcodec(&cyuv_decoder); register_avcodec(&cyuv_decoder);
register_avcodec(&h264_decoder); register_avcodec(&h264_decoder);
register_avcodec(&vp3_decoder); register_avcodec(&vp3_decoder);
......
...@@ -98,6 +98,7 @@ enum CodecID { ...@@ -98,6 +98,7 @@ enum CodecID {
CODEC_ID_MSZH, CODEC_ID_MSZH,
CODEC_ID_ZLIB, CODEC_ID_ZLIB,
CODEC_ID_QTRLE, CODEC_ID_QTRLE,
CODEC_ID_SNOW,
/* various pcm "codecs" */ /* various pcm "codecs" */
CODEC_ID_PCM_S16LE, CODEC_ID_PCM_S16LE,
...@@ -1749,6 +1750,7 @@ extern AVCodec asv1_encoder; ...@@ -1749,6 +1750,7 @@ extern AVCodec asv1_encoder;
extern AVCodec asv2_encoder; extern AVCodec asv2_encoder;
extern AVCodec vcr1_encoder; extern AVCodec vcr1_encoder;
extern AVCodec ffv1_encoder; extern AVCodec ffv1_encoder;
extern AVCodec snow_encoder;
extern AVCodec mdec_encoder; extern AVCodec mdec_encoder;
extern AVCodec zlib_encoder; extern AVCodec zlib_encoder;
extern AVCodec svq1_encoder; extern AVCodec svq1_encoder;
...@@ -1799,6 +1801,7 @@ extern AVCodec asv2_decoder; ...@@ -1799,6 +1801,7 @@ extern AVCodec asv2_decoder;
extern AVCodec vcr1_decoder; extern AVCodec vcr1_decoder;
extern AVCodec cljr_decoder; extern AVCodec cljr_decoder;
extern AVCodec ffv1_decoder; extern AVCodec ffv1_decoder;
extern AVCodec snow_decoder;
extern AVCodec fourxm_decoder; extern AVCodec fourxm_decoder;
extern AVCodec mdec_decoder; extern AVCodec mdec_decoder;
extern AVCodec roq_decoder; extern AVCodec roq_decoder;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -161,6 +161,7 @@ const CodecTag codec_bmp_tags[] = { ...@@ -161,6 +161,7 @@ const CodecTag codec_bmp_tags[] = {
{ 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_MSZH, MKTAG('M', 'S', 'Z', 'H') },
{ CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') }, { CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
{ CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') },
{ CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') }, { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
{ CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') }, { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
{ CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') },
......
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