From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 0FBC84E7EE
for <ffmpegdev@gitmailbox.com>; Mon, 17 Mar 2025 02:49:21 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8A7768CF6F;
Mon, 17 Mar 2025 04:49:18 +0200 (EET)
Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com
[209.85.214.175])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9040968CC56
for <ffmpeg-devel@ffmpeg.org>; Mon, 17 Mar 2025 04:49:12 +0200 (EET)
Received: by mail-pl1-f175.google.com with SMTP id
d9443c01a7336-2239c066347so75886055ad.2
for <ffmpeg-devel@ffmpeg.org>; Sun, 16 Mar 2025 19:49:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742179750; x=1742784550; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=ol7CV/tDN7IYMQB6LEAWrpTQPWBznvclEQat5jOrC6A=;
b=H4NQSsybOhhlEbbm26IiaGn43TdPK2gcnW6g6IfgnIq4RlVnad6CGFOYhEq0/fi3dd
Brw0no/TssDhbxTM9AUedGq85jDh2fVk1Xf6tPexZmNt+7nccgDuoMPynlQMNete1d83
oBJxaSmi7xFW0F0eP1rODVE5sffnEGt9WPSEKlBFIaVXVI36brOpW6x/tafgQkJab8NQ
k7nil3+7WoaGquNoBLPTl3OYl0/rLgkgxzqgDWihAMrsSOJLDML5JsunV7H7kaq0Oesp
5nDHw7Y3mMnYK9ypItWPNy9EzTeka/mMIuSg9M/+yBn44rQ8ftNJb7fixUvOwb3G53IG
2ldQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742179750; x=1742784550;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=ol7CV/tDN7IYMQB6LEAWrpTQPWBznvclEQat5jOrC6A=;
b=gzDSDeQ8Uh8oSTlgdkbNkhEtl0H0fteTOLc7SKq7TVoiklb7hVbq17t1nEv35xMbgh
fbRwC82HarNyh1JdmhhOBFLmd7+2GgqCEBMXi+iwKh2cyC/qMhA8rOUhvLgFugAM18Fg
S0M2KzVJxtV5Dilhy5OSEVc5bdseaCUI43BG8sgqXGieBxuQ1+kAUnam1hMen5ZTTZDY
6OY+6SUN3MZypO/2hjbDGvNpEm9ReW9sVWx0f5cWP7nimRaH5X+qyG6WHYeIgkavW7y5
UIpm+hlio8cQoPUfQvdOfxYgnXYBqI4NtWUdAx4o5No8BnKs2XPWaoFDZFbIdKTxIdSL
CbuA==
X-Gm-Message-State: AOJu0Yzhgz1g3k/VE+OUYvv91w0JtPl/f3SjzlDI9t8AyecGQCayh2Fb
78+zWG5pSkvfb34ECpgaLNwiNQo+GvJUCiZI1ztQinMS6uIvmtvQsCn/Uw==
X-Gm-Gg: ASbGncsjpJ6DJdjovzYq96BHoRWRpNeDdfJw/T8c61+OVMaj+0jdnmiiNaBP3unKn2u
KuM8mozafGO9gHB/I5S5jWtwGkiv0ZhqimGQa+b31GkUGlC2bQJSPyvjbF1MPYxKUNY+EpjYkFQ
XZ/m/+3o73w1TG879eHmtye8wCYGUzTikMYstAkmfXZc+dID2+n7P0HXfJtk7ZnO8BSsBGe8JUF
uOjMnILTFuwUeef368bf1qBBxyngZAcVuQIAhqLAr6X9YhXLfU4VkykAkdL6KJgLeqdoHsiHmPV
4MM9yVS0jxjir125zZ9Nk43dFlYIhxinF4M3jbI9/C1J5WQGgk/NZQDqMnmw
X-Google-Smtp-Source: AGHT+IGbl6RN+ceBm33tRJzU1zSlR4iq9XPWd8cbmuMTfvSVN+uVEGVXAwcOaHq4PWkBr7XC+vDIfA==
X-Received: by 2002:a17:902:cccf:b0:215:b473:1dc9 with SMTP id
d9443c01a7336-225e0b11825mr133342615ad.46.1742179750315;
Sun, 16 Mar 2025 19:49:10 -0700 (PDT)
Received: from localhost.localdomain ([2800:2121:b040:c:e90b:1e6c:4204:7ac9])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-225c6bbe8f9sm63787545ad.175.2025.03.16.19.49.09
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 16 Mar 2025 19:49:09 -0700 (PDT)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Sun, 16 Mar 2025 23:48:56 -0300
Message-ID: <20250317024856.1254-1-jamrial@gmail.com>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] avutil: only duplicate hal2float and
float2half in shared builds
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250317024856.1254-1-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
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".