diff options
| author | James Almer <jamrial@gmail.com> | 2025-03-16 23:26:53 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2025-03-18 17:21:23 -0300 |
| commit | bf22c4cc3e005c01f50e233b1582fd1d8051aed9 (patch) | |
| tree | 2dcf8c6bacb1c2c3b7ab6c5857cafd85ca862c11 | |
| parent | 81c50c33b6f582a268dddedfb0664c9be119a36a (diff) | |
| download | ffmpeg-bf22c4cc3e005c01f50e233b1582fd1d8051aed9.tar.gz | |
avutil: only duplicate hal2float and float2half in shared builds
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/Makefile | 13 | ||||
| -rw-r--r-- | libavutil/Makefile | 2 | ||||
| -rw-r--r-- | libswscale/Makefile | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5284c561a6..f800f08a63 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -365,8 +365,8 @@ OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o OBJS-$(CONFIG_EVRC_DECODER) += evrcdec.o acelp_vectors.o lsp.o -OBJS-$(CONFIG_EXR_DECODER) += exr.o exrdsp.o float2half.o half2float.o -OBJS-$(CONFIG_EXR_ENCODER) += exrenc.o float2half.o +OBJS-$(CONFIG_EXR_DECODER) += exr.o exrdsp.o +OBJS-$(CONFIG_EXR_ENCODER) += exrenc.o OBJS-$(CONFIG_FASTAUDIO_DECODER) += fastaudio.o OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1_parse.o ffv1.o OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1_parse.o ffv1.o @@ -612,8 +612,8 @@ OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o OBJS-$(CONFIG_PGX_DECODER) += pgxdec.o -OBJS-$(CONFIG_PHM_DECODER) += pnmdec.o pnm.o half2float.o -OBJS-$(CONFIG_PHM_ENCODER) += pnmenc.o float2half.o +OBJS-$(CONFIG_PHM_DECODER) += pnmdec.o pnm.o +OBJS-$(CONFIG_PHM_ENCODER) += pnmenc.o OBJS-$(CONFIG_PHOTOCD_DECODER) += photocd.o OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o OBJS-$(CONFIG_PIXLET_DECODER) += pixlet.o @@ -1076,6 +1076,11 @@ OBJS-$(CONFIG_VVC_VAAPI_HWACCEL) += vaapi_vvc.o # Objects duplicated from other libraries for shared builds SHLIBOBJS += log2_tab.o reverse.o +SHLIBOBJS-$(CONFIG_EXR_DECODER) += half2float.o float2half.o +SHLIBOBJS-$(CONFIG_EXR_ENCODER) += float2half.o +SHLIBOBJS-$(CONFIG_PHM_DECODER) += half2float.o +SHLIBOBJS-$(CONFIG_PHM_ENCODER) += float2half.o + # General libavformat dependencies OBJS-$(CONFIG_FITS_DEMUXER) += fits.o OBJS-$(CONFIG_TAK_DEMUXER) += tak.o diff --git a/libavutil/Makefile b/libavutil/Makefile index b7ed339ab3..b03c50444f 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -139,9 +139,11 @@ OBJS = adler32.o \ file.o \ file_open.o \ float_dsp.o \ + float2half.o \ film_grain_params.o \ fixed_dsp.o \ frame.o \ + half2float.o \ hash.o \ hdr_dynamic_metadata.o \ hdr_dynamic_vivid_metadata.o \ diff --git a/libswscale/Makefile b/libswscale/Makefile index 4cf4bb2602..d5e10d17dc 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -13,7 +13,6 @@ OBJS = alphablend.o \ format.o \ gamma.o \ graph.o \ - half2float.o \ input.o \ lut3d.o \ options.o \ @@ -28,7 +27,7 @@ OBJS = alphablend.o \ vscale.o \ # Objects duplicated from other libraries for shared builds -SHLIBOBJS += log2_tab.o +SHLIBOBJS += log2_tab.o half2float.o # Windows resource file SHLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o |