The module is now always compiled in.
Unified · Split
| @@ -140,7 +140,6 @@ Component options: · 139 unmodified lines | ||
| 140 | 140 | --disable-dwt disable DWT code |
| 141 | 141 | --disable-error-resilience disable error resilience code |
| 142 | 142 | --disable-lsp disable LSP code |
| 143 | − --disable-lzo disable LZO decoder code | |
| 144 | 143 | --disable-mdct disable MDCT code |
| 145 | 144 | --disable-rdft disable RDFT code |
| 146 | 145 | --disable-fft disable FFT code |
| @@ -1975,7 +1974,6 @@ SUBSYSTEM_LIST=" · 1828 unmodified lines | ||
| 1975 | 1974 | fast_unaligned |
| 1976 | 1975 | fft |
| 1977 | 1976 | lsp |
| 1978 | − lzo | |
| 1979 | 1977 | mdct |
| 1980 | 1978 | pixelutils |
| 1981 | 1979 | network |
| @@ -2780,7 +2778,6 @@ clearvideo_decoder_select="idctdsp" · 798 unmodified lines | ||
| 2780 | 2778 | cllc_decoder_select="bswapdsp" |
| 2781 | 2779 | comfortnoise_encoder_select="lpc" |
| 2782 | 2780 | cook_decoder_select="audiodsp mdct sinewin" |
| 2783 | −cscd_decoder_select="lzo" | |
| 2784 | 2781 | cscd_decoder_suggest="zlib" |
| 2785 | 2782 | dca_decoder_select="mdct" |
| 2786 | 2783 | dca_encoder_select="mdct" |
| @@ -2896,7 +2893,7 @@ mxpeg_decoder_select="mjpeg_decoder" · 109 unmodified lines | ||
| 2896 | 2893 | nellymoser_decoder_select="mdct sinewin" |
| 2897 | 2894 | nellymoser_encoder_select="audio_frame_queue mdct sinewin" |
| 2898 | 2895 | notchlc_decoder_select="lzf" |
| 2899 | −nuv_decoder_select="idctdsp lzo" | |
| 2896 | +nuv_decoder_select="idctdsp" | |
| 2900 | 2897 | on2avc_decoder_select="mdct" |
| 2901 | 2898 | opus_decoder_deps="swresample" |
| 2902 | 2899 | opus_decoder_select="mdct15" |
| @@ -3423,7 +3420,7 @@ ivf_muxer_select="av1_metadata_bsf vp9_superframe_bsf" · 520 unmodified lines | ||
| 3423 | 3420 | latm_muxer_select="aac_adtstoasc_bsf mpeg4audio" |
| 3424 | 3421 | matroska_audio_muxer_select="matroska_muxer" |
| 3425 | 3422 | matroska_demuxer_select="riffdec" |
| 3426 | −matroska_demuxer_suggest="bzlib lzo zlib" | |
| 3423 | +matroska_demuxer_suggest="bzlib zlib" | |
| 3427 | 3424 | matroska_muxer_select="mpeg4audio riffenc vp9_superframe_bsf aac_adtstoasc_bsf" |
| 3428 | 3425 | mlp_demuxer_select="mlp_parser" |
| 3429 | 3426 | mmf_muxer_select="riffenc" |
| @@ -1684,7 +1684,6 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, · 1683 unmodified lines | ||
| 1684 | 1684 | memcpy(pkt_data + header_size, data, isize); |
| 1685 | 1685 | break; |
| 1686 | 1686 | } |
| 1687 | −#if CONFIG_LZO | |
| 1688 | 1687 | case MATROSKA_TRACK_ENCODING_COMP_LZO: |
| 1689 | 1688 | do { |
| 1690 | 1689 | int insize = isize; |
| @@ -1704,7 +1703,6 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, · 13 unmodified lines | ||
| 1704 | 1703 | } |
| 1705 | 1704 | pkt_size -= olen; |
| 1706 | 1705 | break; |
| 1707 | −#endif | |
| 1708 | 1706 | #if CONFIG_ZLIB |
| 1709 | 1707 | case MATROSKA_TRACK_ENCODING_COMP_ZLIB: |
| 1710 | 1708 | { |
| @@ -2527,9 +2525,7 @@ static int matroska_parse_tracks(AVFormatContext *s) · 816 unmodified lines | ||
| 2527 | 2525 | #if CONFIG_BZLIB |
| 2528 | 2526 | encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB && |
| 2529 | 2527 | #endif |
| 2530 | −#if CONFIG_LZO | |
| 2531 | 2528 | encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO && |
| 2532 | −#endif | |
| 2533 | 2529 | encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) { |
| 2534 | 2530 | encodings[0].scope = 0; |
| 2535 | 2531 | av_log(matroska->ctx, AV_LOG_ERROR, |
| @@ -28,7 +28,7 @@ FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB) += fate-matroska-zlib-decomp · 27 unmodified lines | ||
| 28 | 28 | fate-matroska-zlib-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/subtitle_zlib.mks -c:s copy |
| 29 | 29 | |
| 30 | 30 | # This tests that the matroska demuxer can decompress lzo compressed tracks. |
| 31 | −FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER LZO) += fate-matroska-lzo-decompression | |
| 31 | +FATE_MATROSKA-$(CONFIG_MATROSKA_DEMUXER) += fate-matroska-lzo-decompression | |
| 32 | 32 | fate-matroska-lzo-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/lzo.mka -c copy |
| 33 | 33 | |
| 34 | 34 | # This tests that the matroska demuxer correctly propagates |