From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] avutil: only duplicate hal2float and float2half in shared builds
Date: Sun, 16 Mar 2025 23:48:56 -0300
Message-ID: <20250317024856.1254-1-jamrial@gmail.com> (raw)
As a side effect, this also fixes compilation in shared builds in some
specific configurations after 1eafbf820312d45b31907e16877ae780022598c4.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/Makefile | 13 +++++++++----
libavutil/Makefile | 2 ++
libswscale/Makefile | 3 +--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3c7043a617..08a5985b68 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -366,8 +366,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 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
@@ -613,8 +613,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
@@ -1075,6 +1075,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
--
2.48.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
reply other threads:[~2025-03-17 2:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250317024856.1254-1-jamrial@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git