Mercurial > libavcodec.hg
changeset 4947:6a4e8b52dc7b libavcodec
Allow conditional compilation of H.263-related decoders.
| author | diego |
|---|---|
| date | Wed, 09 May 2007 09:26:06 +0000 |
| parents | c1fb4544bd59 |
| children | 74caff45a271 |
| files | Makefile wmv2.c |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed May 09 01:46:33 2007 +0000 +++ b/Makefile Wed May 09 09:26:06 2007 +0000 @@ -37,8 +37,6 @@ rangecoder.o \ pnm.o \ h263.o \ - msmpeg4.o \ - h263dec.o \ opt.o \ bitstream_filter.o \ audioconvert.o \ @@ -93,6 +91,7 @@ OBJS-$(CONFIG_GIF_ENCODER) += gif.o OBJS-$(CONFIG_H261_DECODER) += h261.o OBJS-$(CONFIG_H261_ENCODER) += h261.o +OBJS-$(CONFIG_H263_DECODER) += h263dec.o OBJS-$(CONFIG_H264_DECODER) += h264.o OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dsp.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o @@ -110,6 +109,12 @@ OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.o OBJS-$(CONFIG_MPC7_DECODER) += mpc.o +OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o +OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o +OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o +OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4.o +OBJS-$(CONFIG_MSMPEG4V3_DECODER) += msmpeg4.o +OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4.o OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o OBJS-$(CONFIG_MSZH_DECODER) += lcl.o
--- a/wmv2.c Wed May 09 01:46:33 2007 +0000 +++ b/wmv2.c Wed May 09 09:26:06 2007 +0000 @@ -835,6 +835,7 @@ return 0; } +#ifdef CONFIG_WMV2_DECODER AVCodec wmv2_decoder = { "wmv2", CODEC_TYPE_VIDEO, @@ -846,6 +847,7 @@ ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, }; +#endif #ifdef CONFIG_ENCODERS AVCodec wmv2_encoder = {