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 8E9794A1EB for ; Sun, 24 Mar 2024 13:19:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C86D68D33E; Sun, 24 Mar 2024 15:19:48 +0200 (EET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E80968D170 for ; Sun, 24 Mar 2024 15:19:41 +0200 (EET) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-33d90dfe73cso1897853f8f.0 for ; Sun, 24 Mar 2024 06:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711286381; x=1711891181; darn=ffmpeg.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=xpfTIz2i30vR0yP2DHEZgD0WlqA65ec49UcRljuFh4g=; b=L7xKwKTPAHlgdq51JYRYRDX3E6HFbjnre8cx8NT5bpEjBCffVmuNpaH8IYYagUB9kd 4UzN8NhhgBk9tXlpoILhWUE5EZ84UD5SrvYSh8ikTzdrIBRkdN++M17r4Pj3VxKGLmeS tmOm8Y4k8InQF8tipaER2wRTKsLSB5GprS1AbP+ufACBP3h9FCHOBCwkrJ3WATGUi0hM 6Qa9/F2BPsPYXqYY0ub+C4mCtU+JXnM3bmxI5RIwPp1KUVOJQXgnrSKYE+A6nTZIbF9G wZplOiNSilgc8lj1dPqt0333QunvehO8GvzXY3nl6aAf3h+vM4O5X1uEZukAiXsOScio nE9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711286381; x=1711891181; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xpfTIz2i30vR0yP2DHEZgD0WlqA65ec49UcRljuFh4g=; b=B2RnrrfTqaTyqbYqLW1l3qQ6P7MhVZSzQzkQH6Fd+ublsHfeTYgox1BbNmf5WgBfg1 V7j8GnqAkw5kqRvCjhcA9hO7Rz6yRcqDSfUF3h+Qito8ueHe/7y3vzBAen6rebM1cMJX jQp28W6sh82RhLy2DXlSgLxR/MMguA5YCy5vQ3DbzTdL0NCBrXRgeg9XjiMm4cENc8QR ZiKQgkaJ2x5F/4lBncA2f6AWQLMuxx2X3oeuBaAjBKteL0RyUE9JpwjcqAafeSalFprU SzkPO/zj8/L0d8j/dr4zg9fiPC7RPwTewVJ5CXFR7Y7TXTp9r7s3HMu+G38VwWXVQMfV WTZQ== X-Gm-Message-State: AOJu0Yxhow7XZpzZ/yTRPG1XtDmveBZcNvb4ZUDBgOFNPd3vD6tTL57x c/H0VNrYCpJKI2/b7hc1vbmQMexCdduy9du6BesbCirMopKqT/4HwyYWCl2I X-Google-Smtp-Source: AGHT+IHqN6VBd72vbfJc5qUSZzF0evOeOgpcbfkVlyOUtPKOmcORVDbXv4AG10fanEvuOMG1LzkL+g== X-Received: by 2002:a5d:4607:0:b0:33e:c68d:d536 with SMTP id t7-20020a5d4607000000b0033ec68dd536mr2793987wrq.15.1711286380585; Sun, 24 Mar 2024 06:19:40 -0700 (PDT) Received: from kusa (2a01cb040b6872000000000000000afa.ipv6.abo.wanadoo.fr. [2a01:cb04:b68:7200::afa]) by smtp.gmail.com with ESMTPSA id p11-20020a056000018b00b0033e75e5f280sm6786528wrx.113.2024.03.24.06.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 06:19:40 -0700 (PDT) Date: Sun, 24 Mar 2024 14:19:39 +0100 From: Matthieu Bouron To: FFmpeg development discussions and patches Message-ID: References: <20240323190518.1031-1-admin@shaoxia.xyz> <20240324051741.79725-1-leo.izen@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240324051741.79725-1-leo.izen@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] 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: On Sun, Mar 24, 2024 at 01:17:41AM -0400, Leo Izen wrote: > 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 7ef2e03ca6..2446db51fd 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 dd5819c06f..fa13ae9a6c 100644 > --- a/libavformat/file.c > +++ b/libavformat/file.c > @@ -43,7 +43,7 @@ > #if CONFIG_ANDROID_CONTENT_PROTOCOL > #include > #include "libavcodec/jni.h" > -#include "libavcodec/ffjni.c" > +#include "libavcodec/ffjni.h" > #endif > > > -- > 2.44.0 LGTM. Sorry for the regression. _______________________________________________ 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".