History

avfilter/Makefile: always make colorspace.o

Unbreaks libavfilter builds when configured with a subset of filters. drawutils added ff_draw_init2 in 6c3a82f043 which calls functions defined in colorspace.c. So the latter needs to be built alongside the former.

Gyan Doshi committed 4 years ago

Commit 0744c841 parent beaf1721 file · +6 −5Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/Makefile+6−5
@@ -13,6 +13,7 @@ OBJS = allfilters.o \ · 12 unmodified lines
1313 avfiltergraph.o \
1414 buffersink.o \
1515 buffersrc.o \
16+ colorspace.o \
1617 drawutils.o \
1718 fifo.o \
1819 formats.o \
@@ -225,7 +226,7 @@ OBJS-$(CONFIG_COLORHOLD_FILTER) += vf_colorkey.o · 206 unmodified lines
225226 OBJS-$(CONFIG_COLORLEVELS_FILTER) += vf_colorlevels.o
226227 OBJS-$(CONFIG_COLORMAP_FILTER) += vf_colormap.o
227228 OBJS-$(CONFIG_COLORMATRIX_FILTER) += vf_colormatrix.o
228−OBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o colorspace.o colorspacedsp.o
229+OBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o colorspacedsp.o
229230 OBJS-$(CONFIG_COLORTEMPERATURE_FILTER) += vf_colortemperature.o
230231 OBJS-$(CONFIG_CONVOLUTION_FILTER) += vf_convolution.o
231232 OBJS-$(CONFIG_CONVOLUTION_OPENCL_FILTER) += vf_convolution_opencl.o opencl.o \
@@ -327,8 +328,8 @@ OBJS-$(CONFIG_HWMAP_FILTER) += vf_hwmap.o · 95 unmodified lines
327328 OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER) += vf_hwupload_cuda.o
328329 OBJS-$(CONFIG_HWUPLOAD_FILTER) += vf_hwupload.o
329330 OBJS-$(CONFIG_HYSTERESIS_FILTER) += vf_hysteresis.o framesync.o
330−OBJS-$(CONFIG_ICCDETECT_FILTER) += vf_iccdetect.o fflcms2.o colorspace.o
331−OBJS-$(CONFIG_ICCGEN_FILTER) += vf_iccgen.o fflcms2.o colorspace.o
331+OBJS-$(CONFIG_ICCDETECT_FILTER) += vf_iccdetect.o fflcms2.o
332+OBJS-$(CONFIG_ICCGEN_FILTER) += vf_iccgen.o fflcms2.o
332333 OBJS-$(CONFIG_IDENTITY_FILTER) += vf_identity.o
333334 OBJS-$(CONFIG_IDET_FILTER) += vf_idet.o
334335 OBJS-$(CONFIG_IL_FILTER) += vf_il.o
@@ -492,8 +493,8 @@ OBJS-$(CONFIG_TLUT2_FILTER) += vf_lut2.o framesync.o · 157 unmodified lines
492493 OBJS-$(CONFIG_TMEDIAN_FILTER) += vf_xmedian.o framesync.o
493494 OBJS-$(CONFIG_TMIDEQUALIZER_FILTER) += vf_tmidequalizer.o
494495 OBJS-$(CONFIG_TMIX_FILTER) += vf_mix.o framesync.o
495−OBJS-$(CONFIG_TONEMAP_FILTER) += vf_tonemap.o colorspace.o
496−OBJS-$(CONFIG_TONEMAP_OPENCL_FILTER) += vf_tonemap_opencl.o colorspace.o opencl.o \
496+OBJS-$(CONFIG_TONEMAP_FILTER) += vf_tonemap.o
497+OBJS-$(CONFIG_TONEMAP_OPENCL_FILTER) += vf_tonemap_opencl.o opencl.o \
497498 opencl/tonemap.o opencl/colorspace_common.o
498499 OBJS-$(CONFIG_TONEMAP_VAAPI_FILTER) += vf_tonemap_vaapi.o vaapi_vpp.o
499500 OBJS-$(CONFIG_TPAD_FILTER) += vf_tpad.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