From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D1D8E4A3E3 for ; Wed, 27 Mar 2024 13:06:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9FDD768D6EB; Wed, 27 Mar 2024 15:06:31 +0200 (EET) Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40E4068CDEA for ; Wed, 27 Mar 2024 15:06:23 +0200 (EET) Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-43123e9a284so2057491cf.1 for ; Wed, 27 Mar 2024 06:06:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711544782; x=1712149582; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dVS+z9fexD/m/bVquXGktBFHTrCnXpPgag5Mi5AaG7E=; b=C5A9RqApPriu/ehVFrC7QjykX7xPatEc1jUmGVchBWP4vy2RDDo1glEWGsBB7NSOL+ Qy1sw9NU1snMJpnHUTMH8VhytVPgYjl8tbsUD1EE8JkznroDoQZZ0kZK4xsj30lYHBKz M4forgsuy9W6TRNGB9yXYR6xlZ9BCrFiJJMJFqxwuoO0pKTDTTMu7ytUaghF3xJ4yRJM 8oxkMoTb+I2z74gnHdAP5Z58vWD9dK5fhAA/Qn0Hlsz2tvbCBbyXn/WmOzrFNNllsvkb fBuEo3NjODUxJD6v2GeqHH9f8Tkyz89dbNLznZ48DdSO8X89pWAVkOJjAx2CIYD4zjRt G34g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711544782; x=1712149582; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dVS+z9fexD/m/bVquXGktBFHTrCnXpPgag5Mi5AaG7E=; b=hyb172o7Y1UtCstXogT8bEWPMu8ApOvvyo/dlNXkDQki8xU/og1TWVK7Z2QlMw9cNR LsHN9/BIswVmISisfVDP/og74aEDF6CSs4CC0PrfYnazz6vpNMAK2eVdYndWolJEAqqU XvSwMvPJtPE763XSFcuKo6F/WS3h78f1WJzayZMG/SQAAEr2yyU0iJacmS5CaBE+Ryde ZS80KxyNhpGLIPEiI5HUN+X4jaMTPJtJQgOOLzj4Xl0XmlRP8SbQIE6XYHZLjT31DVxt r8iVGqYDs6jeF2hTafU0iMmUGyk+xS4JBZgAdqW16UoTixMnE7sR/q5vkEJZR97fAajT YS1A== X-Gm-Message-State: AOJu0Yy+lgxd2e4q7ynDab69q5rN7crSvJnnxRK85BNCUrNHesMTdyD3 MLhIWNPeUQfLTcAI1IF9uqkUWvpYG3Y6zqES1mwbeSGUb2R3bblMEGqHnbQ8GeQ= X-Google-Smtp-Source: AGHT+IHog/n9MsM1NKTJ1Qho0jUlEm4CtQ1PBRbB4XN1tnLNxMik2v4cAT3868rjT9a4ZULUodPkOg== X-Received: by 2002:a05:620a:559c:b0:78a:6de:874b with SMTP id vq28-20020a05620a559c00b0078a06de874bmr12852168qkn.7.1711544781932; Wed, 27 Mar 2024 06:06:21 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id cz52-20020a05620a36f400b0078a43996ab7sm3851082qkb.1.2024.03.27.06.06.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 06:06:21 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2024 09:06:19 -0400 Message-ID: <20240327130619.273711-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240327130619.273711-1-leo.izen@gmail.com> References: <20240327130619.273711-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/1] avcodec, avformat/ffjni: fix duplicate JNI symbols X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Leo Izen Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Use SHLIBOBJS and STLIBOBJS in the Makefiles for avcodec and avformat, and add a stub ffjni.c to libavformat, which allows the symbols to be duplicated for shared builds but not static builds. Signed-off-by: Leo Izen --- libavcodec/Makefile | 1 + libavformat/Makefile | 1 + libavformat/ffjni.c | 23 +++++++++++++++++++++++ libavformat/file.c | 2 +- 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 libavformat/ffjni.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9ce6d445c1..113adb22d5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1068,6 +1068,7 @@ STLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o STLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o STLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o STLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o +STLIBOBJS-$(CONFIG_JNI) += ffjni.o STLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o STLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o STLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o diff --git a/libavformat/Makefile b/libavformat/Makefile index 44aa485029..a89df7e9a3 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -728,6 +728,7 @@ SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o +SHLIBOBJS-$(CONFIG_JNI) += ffjni.o SHLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o SHLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o SHLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o diff --git a/libavformat/ffjni.c b/libavformat/ffjni.c new file mode 100644 index 0000000000..2b1483cf42 --- /dev/null +++ b/libavformat/ffjni.c @@ -0,0 +1,23 @@ +/* + * JNI utility functions - included stub + * + * Copyright (c) 2024 Leo Izen + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavcodec/ffjni.c" diff --git a/libavformat/file.c b/libavformat/file.c index 182995717a..1f853e0e17 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -527,8 +527,8 @@ const URLProtocol ff_fd_protocol = { #if CONFIG_ANDROID_CONTENT_PROTOCOL #include +#include "libavcodec/ffjni.h" #include "libavcodec/jni.h" -#include "libavcodec/ffjni.c" typedef struct JFields { jclass uri_class; -- 2.44.0 _______________________________________________ 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".