diff mbox series

[FFmpeg-devel,1/2,v2] avutil: make lzo always compile

Message ID 20220226153354.1951-1-jamrial@gmail.com
State Accepted
Commit ff145498b25e20f0563c75bbb84d1513df634d4c
Headers show
Series [FFmpeg-devel,1/2,v2] avutil: make lzo always compile | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished

Commit Message

James Almer Feb. 26, 2022, 3:33 p.m. UTC 
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 mbox series

Patch

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