Commit 8809cfee authored by Michael Niedermayer's avatar Michael Niedermayer

4xm codec

Originally committed as revision 1923 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 642d7e84
This diff is collapsed.
......@@ -17,7 +17,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \
mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \
ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
fft.o mdct.o mace.o huffyuv.o cyuv.o opts.o raw.o h264.o golomb.o \
vp3.o asv1.o
vp3.o asv1.o 4xm.o cabac.o
ifeq ($(AMR_NB),yes)
OBJS+= amr.o
......
......@@ -105,6 +105,7 @@ void avcodec_register_all(void)
register_avcodec(&h264_decoder);
register_avcodec(&vp3_decoder);
register_avcodec(&asv1_decoder);
register_avcodec(&fourxm_decoder);
#ifdef CONFIG_AC3
register_avcodec(&ac3_decoder);
#endif
......
......@@ -1248,6 +1248,7 @@ extern AVCodec amr_nb_decoder;
extern AVCodec aac_decoder;
extern AVCodec mpeg4aac_decoder;
extern AVCodec asv1_decoder;
extern AVCodec fourxm_decoder;
/* pcm codecs */
#define PCM_CODEC(id, name) \
......
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