Skip to content

Commit bf22c4c

Browse files
committed
avutil: only duplicate hal2float and float2half in shared builds
Signed-off-by: James Almer <[email protected]>
1 parent 81c50c3 commit bf22c4c

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

libavcodec/Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o
365365
OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o
366366
OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o
367367
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
370370
OBJS-$(CONFIG_FASTAUDIO_DECODER) += fastaudio.o
371371
OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1_parse.o ffv1.o
372372
OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1_parse.o ffv1.o
@@ -612,8 +612,8 @@ OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o
612612
OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o
613613
OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o
614614
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
617617
OBJS-$(CONFIG_PHOTOCD_DECODER) += photocd.o
618618
OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o
619619
OBJS-$(CONFIG_PIXLET_DECODER) += pixlet.o
@@ -1076,6 +1076,11 @@ OBJS-$(CONFIG_VVC_VAAPI_HWACCEL) += vaapi_vvc.o
10761076
# Objects duplicated from other libraries for shared builds
10771077
SHLIBOBJS += log2_tab.o reverse.o
10781078

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+
10791084
# General libavformat dependencies
10801085
OBJS-$(CONFIG_FITS_DEMUXER) += fits.o
10811086
OBJS-$(CONFIG_TAK_DEMUXER) += tak.o

libavutil/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,11 @@ OBJS = adler32.o \
139139
file.o \
140140
file_open.o \
141141
float_dsp.o \
142+
float2half.o \
142143
film_grain_params.o \
143144
fixed_dsp.o \
144145
frame.o \
146+
half2float.o \
145147
hash.o \
146148
hdr_dynamic_metadata.o \
147149
hdr_dynamic_vivid_metadata.o \

libswscale/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ OBJS = alphablend.o \
1313
format.o \
1414
gamma.o \
1515
graph.o \
16-
half2float.o \
1716
input.o \
1817
lut3d.o \
1918
options.o \
@@ -28,7 +27,7 @@ OBJS = alphablend.o \
2827
vscale.o \
2928

3029
# Objects duplicated from other libraries for shared builds
31-
SHLIBOBJS += log2_tab.o
30+
SHLIBOBJS += log2_tab.o half2float.o
3231

3332
# Windows resource file
3433
SHLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o

0 commit comments

Comments
 (0)