On Tue, Mar 26, 2013 at 06:26:38PM +0200, Martin Storsjö wrote:
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -248,13 +248,11 @@ OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o
> msmpeg4data.o
> OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \
> h263.o ituh263dec.o mpeg4videodec.o
> OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4.o msmpeg4enc.o
> msmpeg4data.o \
> - h263dec.o h263.o ituh263dec.o
> \
> - mpeg4videodec.o
> + h263.o
> OBJS-$(CONFIG_MSMPEG4V3_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \
> h263.o ituh263dec.o mpeg4videodec.o
> OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4.o msmpeg4enc.o
> msmpeg4data.o \
> - h263dec.o h263.o ituh263dec.o
> \
> - mpeg4videodec.o
> + h263.o
> @@ -396,8 +394,7 @@ OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o
> wmv2.o wmv2dsp.o \
> msmpeg4.o msmpeg4data.o \
> intrax8.o intrax8dsp.o
> OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2dsp.o \
> - msmpeg4.o msmpeg4enc.o
> msmpeg4data.o \
> - mpeg4videodec.o ituh263dec.o
> h263dec.o
> + msmpeg4.o msmpeg4enc.o
> msmpeg4data.o
These dependency lists do indeed look mighty silly...
> --- a/libavcodec/msmpeg4.c
> +++ b/libavcodec/msmpeg4.c
> @@ -584,6 +584,9 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s,
> int16_t block[6][64])
>
> +#if CONFIG_MSMPEG4V1_DECODER || CONFIG_MSMPEG4V2_DECODER || \
> + CONFIG_MSMPEG4V3_DECODER || CONFIG_WMV1_DECODER || CONFIG_WMV2_DECODER
> || \
> + CONFIG_VC1_DECODER
> /* init all vlc decoding tables */
> av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)
> {
> @@ -1258,3 +1261,4 @@ AVCodec ff_wmv1_decoder = {
> .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
> .pix_fmts = ff_pixfmt_list_420,
> };
> +#endif
I suspect that splitting off the decoder code from the shared code should
work just as well, but be much cleaner.
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
