avutil: only duplicate hal2float and float2half in shared builds

James Almer committed 1 year ago

Commit bf22c4c1 parent 81c50c33 files · +12 −6Browse files

Unified · Split

3 files

libavcodec/Makefile +9 −4
libavutil/Makefile +2 −0
libswscale/Makefile +1 −2

@@ -365,8 +365,8 @@ OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o · 364 unmodified lines
365	365	OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o
366	366	OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o
367	367	OBJS-$(CONFIG_EVRC_DECODER) += evrcdec.o acelp_vectors.o lsp.o
368		−OBJS-$(CONFIG_EXR_DECODER) += exr.o exrdsp.o float2half.o half2float.o
369		−OBJS-$(CONFIG_EXR_ENCODER) += exrenc.o float2half.o
	368	+OBJS-$(CONFIG_EXR_DECODER) += exr.o exrdsp.o
	369	+OBJS-$(CONFIG_EXR_ENCODER) += exrenc.o
370	370	OBJS-$(CONFIG_FASTAUDIO_DECODER) += fastaudio.o
371	371	OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1_parse.o ffv1.o
372	372	OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1_parse.o ffv1.o
@@ -612,8 +612,8 @@ OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o · 239 unmodified lines
612	612	OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o
613	613	OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o
614	614	OBJS-$(CONFIG_PGX_DECODER) += pgxdec.o
615		−OBJS-$(CONFIG_PHM_DECODER) += pnmdec.o pnm.o half2float.o
616		−OBJS-$(CONFIG_PHM_ENCODER) += pnmenc.o float2half.o
	615	+OBJS-$(CONFIG_PHM_DECODER) += pnmdec.o pnm.o
	616	+OBJS-$(CONFIG_PHM_ENCODER) += pnmenc.o
617	617	OBJS-$(CONFIG_PHOTOCD_DECODER) += photocd.o
618	618	OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o
619	619	OBJS-$(CONFIG_PIXLET_DECODER) += pixlet.o
@@ -1076,6 +1076,11 @@ OBJS-$(CONFIG_VVC_VAAPI_HWACCEL) += vaapi_vvc.o · 456 unmodified lines
1076	1076	# Objects duplicated from other libraries for shared builds
1077	1077	SHLIBOBJS += log2_tab.o reverse.o
1078	1078
	1079	+SHLIBOBJS-$(CONFIG_EXR_DECODER) += half2float.o float2half.o
	1080	+SHLIBOBJS-$(CONFIG_EXR_ENCODER) += float2half.o
	1081	+SHLIBOBJS-$(CONFIG_PHM_DECODER) += half2float.o
	1082	+SHLIBOBJS-$(CONFIG_PHM_ENCODER) += float2half.o
	1083	+
1079	1084	# General libavformat dependencies
1080	1085	OBJS-$(CONFIG_FITS_DEMUXER) += fits.o
1081	1086	OBJS-$(CONFIG_TAK_DEMUXER) += tak.o

libavutil/Makefile+2−0

@@ -139,9 +139,11 @@ OBJS = adler32.o \ · 138 unmodified lines
139	139	file.o \
140	140	file_open.o \
141	141	float_dsp.o \
	142	+ float2half.o \
142	143	film_grain_params.o \
143	144	fixed_dsp.o \
144	145	frame.o \
	146	+ half2float.o \
145	147	hash.o \
146	148	hdr_dynamic_metadata.o \
147	149	hdr_dynamic_vivid_metadata.o \

libswscale/Makefile+1−2

@@ -13,7 +13,6 @@ OBJS = alphablend.o \ · 12 unmodified lines
13	13	format.o \
14	14	gamma.o \
15	15	graph.o \
16		− half2float.o \
17	16	input.o \
18	17	lut3d.o \
19	18	options.o \
@@ -28,7 +27,7 @@ OBJS = alphablend.o \ · 8 unmodified lines
28	27	vscale.o \
29	28
30	29	# Objects duplicated from other libraries for shared builds
31		−SHLIBOBJS += log2_tab.o
	30	+SHLIBOBJS += log2_tab.o half2float.o
32	31
33	32	# Windows resource file
34	33	SHLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o

avutil: only duplicate hal2float and float2half in shared builds

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code