* [FFmpeg-devel] [PATCH 1/2 v2] avutil: make lzo always compile @ 2022-02-26 15:33 James Almer 2022-02-26 15:33 ` [FFmpeg-devel] [PATCH 2/2] configure: stop allowing disabling lzo James Almer 0 siblings, 1 reply; 4+ messages in thread From: James Almer @ 2022-02-26 15:33 UTC (permalink / raw) To: ffmpeg-devel Having optionally installed headers is a bad idea as there's no way to know if they are present or not, and the module is small enough that it's pointless having it be optional. Signed-off-by: James Almer <jamrial@gmail.com> --- libavutil/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavutil/Makefile b/libavutil/Makefile index d17876df1a..b867d3b362 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -52,6 +52,7 @@ HEADERS = adler32.h \ intreadwrite.h \ lfg.h \ log.h \ + lzo.h \ macros.h \ mathematics.h \ mastering_display_metadata.h \ @@ -87,8 +88,6 @@ HEADERS = adler32.h \ tx.h \ film_grain_params.h \ -HEADERS-$(CONFIG_LZO) += lzo.h - ARCH_HEADERS = bswap.h \ intmath.h \ intreadwrite.h \ @@ -139,6 +138,7 @@ OBJS = adler32.o \ lls.o \ log.o \ log2_tab.o \ + lzo.o \ mathematics.o \ mastering_display_metadata.o \ md5.o \ @@ -180,7 +180,6 @@ OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o OBJS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.o OBJS-$(CONFIG_DXVA2) += hwcontext_dxva2.o OBJS-$(CONFIG_LIBDRM) += hwcontext_drm.o -OBJS-$(CONFIG_LZO) += lzo.o OBJS-$(CONFIG_MACOS_KPERF) += macos_kperf.o OBJS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.o OBJS-$(CONFIG_OPENCL) += hwcontext_opencl.o -- 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-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 4+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] configure: stop allowing disabling lzo 2022-02-26 15:33 [FFmpeg-devel] [PATCH 1/2 v2] avutil: make lzo always compile James Almer @ 2022-02-26 15:33 ` James Almer 2022-02-26 16:46 ` Reimar Döffinger 0 siblings, 1 reply; 4+ messages in thread From: James Almer @ 2022-02-26 15:33 UTC (permalink / raw) To: ffmpeg-devel The module is now always compiled in. Signed-off-by: James Almer <jamrial@gmail.com> --- 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-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 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-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] configure: stop allowing disabling lzo 2022-02-26 15:33 ` [FFmpeg-devel] [PATCH 2/2] configure: stop allowing disabling lzo James Almer @ 2022-02-26 16:46 ` Reimar Döffinger 2022-02-26 17:24 ` James Almer 0 siblings, 1 reply; 4+ messages in thread From: Reimar Döffinger @ 2022-02-26 16:46 UTC (permalink / raw) To: FFmpeg development discussions and patches > On 26 Feb 2022, at 16:33, James Almer <jamrial@gmail.com> wrote: > > The module is now always compiled in. Thanks, both patches in this series or the alternative patch are fine with me. Only possible downside I could think of is if there is any use-case why someone would want the matroska decoder to specifically NOT have LZO support. Best regards, Reimar P.S.: If it's not too much effort I do appreciate a CC on patches for things where I am mentioned in MAINTAINERS as the list is a bit high-traffic for me _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] configure: stop allowing disabling lzo 2022-02-26 16:46 ` Reimar Döffinger @ 2022-02-26 17:24 ` James Almer 0 siblings, 0 replies; 4+ messages in thread From: James Almer @ 2022-02-26 17:24 UTC (permalink / raw) To: ffmpeg-devel; +Cc: Reimar Döffinger On 2/26/2022 1:46 PM, Reimar Döffinger wrote: > >> On 26 Feb 2022, at 16:33, James Almer <jamrial@gmail.com> wrote: >> >> The module is now always compiled in. > > Thanks, both patches in this series or the alternative patch are fine with me. > Only possible downside I could think of is if there is any use-case why someone would want the matroska decoder to specifically NOT have LZO support. > Applied then, thanks. > Best regards, > Reimar > > P.S.: If it's not too much effort I do appreciate a CC on patches for things where I am mentioned in MAINTAINERS as the list is a bit high-traffic for me > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-26 17:24 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-02-26 15:33 [FFmpeg-devel] [PATCH 1/2 v2] avutil: make lzo always compile James Almer 2022-02-26 15:33 ` [FFmpeg-devel] [PATCH 2/2] configure: stop allowing disabling lzo James Almer 2022-02-26 16:46 ` Reimar Döffinger 2022-02-26 17:24 ` James Almer
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git