The module is now always compiled in.
Signed-off-by: James Almer
---
configure | 7 ++-
libavformat/matroskadec.c | 4
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index 4dab8d4715..8c69ab0c86 100755
--- a/configure
+++ b/configure
@@ -140,7 +140,6 @@ Component options:
--disable-dwtdisable DWT code
--disable-error-resilience disable error resilience code
--disable-lspdisable LSP code
- --disable-lzodisable LZO decoder code
--disable-mdct disable MDCT code
--disable-rdft disable RDFT code
--disable-fftdisable FFT code
@@ -1975,7 +1974,6 @@ SUBSYSTEM_LIST="
fast_unaligned
fft
lsp
-lzo
mdct
pixelutils
network
@@ -2780,7 +2778,6 @@ clearvideo_decoder_select="idctdsp"
cllc_decoder_select="bswapdsp"
comfortnoise_encoder_select="lpc"
cook_decoder_select="audiodsp mdct sinewin"
-cscd_decoder_select="lzo"
cscd_decoder_suggest="zlib"
dca_decoder_select="mdct"
dca_encoder_select="mdct"
@@ -2896,7 +2893,7 @@ mxpeg_decoder_select="mjpeg_decoder"
nellymoser_decoder_select="mdct sinewin"
nellymoser_encoder_select="audio_frame_queue mdct sinewin"
notchlc_decoder_select="lzf"
-nuv_decoder_select="idctdsp lzo"
+nuv_decoder_select="idctdsp"
on2avc_decoder_select="mdct"
opus_decoder_deps="swresample"
opus_decoder_select="mdct15"
@@ -3423,7 +3420,7 @@ ivf_muxer_select="av1_metadata_bsf vp9_superframe_bsf"
latm_muxer_select="aac_adtstoasc_bsf mpeg4audio"
matroska_audio_muxer_select="matroska_muxer"
matroska_demuxer_select="riffdec"
-matroska_demuxer_suggest="bzlib lzo zlib"
+matroska_demuxer_suggest="bzlib zlib"
matroska_muxer_select="mpeg4audio riffenc vp9_superframe_bsf aac_adtstoasc_bsf"
mlp_demuxer_select="mlp_parser"
mmf_muxer_select="riffenc"
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 31e5111225..36b96df351 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1684,7 +1684,6 @@ static int matroska_decode_buffer(uint8_t **buf, int
*buf_size,
memcpy(pkt_data + header_size, data, isize);
break;
}
-#if CONFIG_LZO
case MATROSKA_TRACK_ENCODING_COMP_LZO:
do {
int insize = isize;
@@ -1704,7 +1703,6 @@ static int matroska_decode_buffer(uint8_t **buf, int
*buf_size,
}
pkt_size -= olen;
break;
-#endif
#if CONFIG_ZLIB
case MATROSKA_TRACK_ENCODING_COMP_ZLIB:
{
@@ -2527,9 +2525,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
#if CONFIG_BZLIB
encodings[0].compression.algo !=
MATROSKA_TRACK_ENCODING_COMP_BZLIB &&
#endif
-#if CONFIG_LZO
encodings[0].compression.algo !=
MATROSKA_TRACK_ENCODING_COMP_LZO &&
-#endif
encodings[0].compression.algo !=
MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) {
encodings[0].scope = 0;
av_log(matroska->ctx, AV_LOG_ERROR,
--
2.35.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
