diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-05-09 09:26:06 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-05-09 09:26:06 +0000 |
| commit | 4a815a7f6493addd7f268a557a431a2afe60679f (patch) | |
| tree | a2e6453b5d109d010a7e5cca5030621ad6c87403 /libavcodec | |
| parent | 2462e4b76516ea405f525db034cd7a53816a47e0 (diff) | |
| download | ffmpeg-4a815a7f6493addd7f268a557a431a2afe60679f.tar.gz | |
Allow conditional compilation of H.263-related decoders.
Originally committed as revision 8949 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 9 | ||||
| -rw-r--r-- | libavcodec/wmv2.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ece2a2e0f7..8d616b2ca7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -37,8 +37,6 @@ OBJS= bitstream.o \ rangecoder.o \ pnm.o \ h263.o \ - msmpeg4.o \ - h263dec.o \ opt.o \ bitstream_filter.o \ audioconvert.o \ @@ -93,6 +91,7 @@ OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o 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_MACE6_DECODER) += mace.o 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 diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index d57eaa5e4a..8162f642eb 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -835,6 +835,7 @@ static int wmv2_decode_init(AVCodecContext *avctx){ return 0; } +#ifdef CONFIG_WMV2_DECODER AVCodec wmv2_decoder = { "wmv2", CODEC_TYPE_VIDEO, @@ -846,6 +847,7 @@ AVCodec wmv2_decoder = { ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, }; +#endif #ifdef CONFIG_ENCODERS AVCodec wmv2_encoder = { |