This fixes standalone compilation of the msmpeg4v2, msmpeg4v3
and wmv2 encoders, that previously failed to link due to
the decoder codepaths requiring error_resilience.
---
libavcodec/Makefile | 9 +++------
libavcodec/msmpeg4.c | 4 ++++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index addf5a5..38cf6a3 100644
--- 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
OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o
OBJS-$(CONFIG_MSA1_DECODER) += mss3.o mss34dsp.o
OBJS-$(CONFIG_MSS1_DECODER) += mss1.o mss12.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
OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o
OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o
OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index e22a8e4..8c70772 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -584,6 +584,9 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t
block[6][64])
return 0;
}
+#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
--
1.7.9.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
