Skip to content

Commit 1722f08

Browse files
committed
avutil/Makefile: Only include half2float, float2half when needed
They are not needed for shared builds (and because --gc-sections is not the default for shared builds, they were included by default included in libavutil since bf22c4c). Signed-off-by: Andreas Rheinhardt <[email protected]>
1 parent 52d766e commit 1722f08

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

libavutil/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,10 @@ OBJS = adler32.o \
139139
file.o \
140140
file_open.o \
141141
float_dsp.o \
142-
float2half.o \
143142
float_scalarproduct.o \
144143
film_grain_params.o \
145144
fixed_dsp.o \
146145
frame.o \
147-
half2float.o \
148146
hash.o \
149147
hdr_dynamic_metadata.o \
150148
hdr_dynamic_vivid_metadata.o \
@@ -221,6 +219,13 @@ OBJS-$(!CONFIG_VULKAN) += hwcontext_stub.o
221219

222220
OBJS += $(COMPAT_OBJS:%=../compat/%)
223221

222+
# Object files to satisfy dependencies of other libraries for static builds
223+
STLIBOBJS-$(CONFIG_EXR_DECODER) += half2float.o float2half.o
224+
STLIBOBJS-$(CONFIG_EXR_ENCODER) += float2half.o
225+
STLIBOBJS-$(CONFIG_PHM_DECODER) += half2float.o
226+
STLIBOBJS-$(CONFIG_PHM_ENCODER) += float2half.o
227+
STLIBOBJS-$(CONFIG_SWSCALE) += half2float.o
228+
224229
# Windows resource file
225230
SHLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o
226231

0 commit comments

Comments
 (0)