History

configure: stop allowing disabling lzo

The module is now always compiled in.

James Almer committed 4 years ago

Commit df272921 parent ff145493 files · +3 −10Browse files

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t