History

avutil: make lzo always compile

Having optionally installed headers is a bad idea as there's no way to know if they are present or not (unless a define is added to avconfig.h, but that's just ugly).

James Almer committed 4 years ago

Commit ff145491 parent 6562d281 file · +2 −3Browse files

Unified · Split

libavutil/Makefile+2−3
@@ -52,6 +52,7 @@ HEADERS = adler32.h \ · 51 unmodified lines
52 intreadwrite.h \52 intreadwrite.h \
53 lfg.h \53 lfg.h \
54 log.h \54 log.h \
55 lzo.h \
55 macros.h \56 macros.h \
56 mathematics.h \57 mathematics.h \
57 mastering_display_metadata.h \58 mastering_display_metadata.h \
@@ -87,8 +88,6 @@ HEADERS = adler32.h \ · 29 unmodified lines
87 tx.h \88 tx.h \
88 film_grain_params.h \89 film_grain_params.h \
89 90
90HEADERS-$(CONFIG_LZO) += lzo.h
91
92ARCH_HEADERS = bswap.h \91ARCH_HEADERS = bswap.h \
93 intmath.h \92 intmath.h \
94 intreadwrite.h \93 intreadwrite.h \
@@ -139,6 +138,7 @@ OBJS = adler32.o \ · 44 unmodified lines
139 lls.o \138 lls.o \
140 log.o \139 log.o \
141 log2_tab.o \140 log2_tab.o \
141 lzo.o \
142 mathematics.o \142 mathematics.o \
143 mastering_display_metadata.o \143 mastering_display_metadata.o \
144 md5.o \144 md5.o \
@@ -180,7 +180,6 @@ OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o · 35 unmodified lines
180OBJS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.o180OBJS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.o
181OBJS-$(CONFIG_DXVA2) += hwcontext_dxva2.o181OBJS-$(CONFIG_DXVA2) += hwcontext_dxva2.o
182OBJS-$(CONFIG_LIBDRM) += hwcontext_drm.o182OBJS-$(CONFIG_LIBDRM) += hwcontext_drm.o
183OBJS-$(CONFIG_LZO) += lzo.o
184OBJS-$(CONFIG_MACOS_KPERF) += macos_kperf.o183OBJS-$(CONFIG_MACOS_KPERF) += macos_kperf.o
185OBJS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.o184OBJS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.o
186OBJS-$(CONFIG_OPENCL) += hwcontext_opencl.o185OBJS-$(CONFIG_OPENCL) += hwcontext_opencl.o

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