diff options
| author | James Almer <jamrial@gmail.com> | 2022-02-26 12:28:44 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-02-26 14:22:07 -0300 |
| commit | df272928ff8041f87b92f4cf8dbf12a28fe9cdf7 (patch) | |
| tree | d58bf75faad3565f42701836cd1c2e81c583ad06 | |
| parent | ff145498b25e20f0563c75bbb84d1513df634d4c (diff) | |
configure: stop allowing disabling lzo
The module is now always compiled in.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 4 | ||||
| -rw-r--r-- | tests/fate/matroska.mak | 2 |
3 files changed, 3 insertions, 10 deletions
@@ -140,7 +140,6 @@ Component options: --disable-dwt disable DWT code --disable-error-resilience disable error resilience code --disable-lsp disable LSP code - --disable-lzo disable LZO decoder code --disable-mdct disable MDCT code --disable-rdft disable RDFT code --disable-fft disable 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 974bc6f8e3..95e49cbe7f 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, diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 72267d13aa..3073b0a061 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -28,7 +28,7 @@ FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB) += fate-matroska-zlib-decomp fate-matroska-zlib-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/subtitle_zlib.mks -c:s copy # This tests that the matroska demuxer can decompress lzo compressed tracks. -FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER LZO) += fate-matroska-lzo-decompression +FATE_MATROSKA-$(CONFIG_MATROSKA_DEMUXER) += fate-matroska-lzo-decompression fate-matroska-lzo-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/lzo.mka -c copy # This tests that the matroska demuxer correctly propagates |