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 5AECD498F8 for ; Sun, 24 Mar 2024 02:44:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 99A6168C4B0; Sun, 24 Mar 2024 04:44:44 +0200 (EET) Received: from out203-205-251-84.mail.qq.com (unknown [203.205.251.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 586F168C234 for ; Sun, 24 Mar 2024 04:44:37 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1711248267; bh=cLjBos9q4TeD5dbhAKSk82DpQ/aOU5aHgeNub/t+a9o=; h=From:To:Cc:Subject:Date; b=HN4VOkc4Xjq+Tb8v7dAcEG5PiNJQKC2oT3ruwcpJMtpeG0bekKBPcZ+7C+I4I0o/M tTiupEv1ZqURNNYk6idHyc70OVct1Phu19qGQWZ/CJr+pKq9ul999zcZUSH5OAs2tK te8id1YdTj2MuwcFH8XEZ8vWHg+RHEJpsp5xIyVE= Received: from localhost.localdomain ([113.116.29.47]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id B1AB7C7D; Sun, 24 Mar 2024 10:44:26 +0800 X-QQ-mid: xmsmtpt1711248266tjr1cxczg Message-ID: X-QQ-XMAILINFO: NhpLzBn2I3XwcwYXi0jPn+acLPO9OO83YIcBSO0Rv5BtSMo4BUDCZXzEudhNNe GmzFkumnfFfsZr+E0kJPs9331xhcnOFy3TeEglVscngsYrMeoQNQfRisO0pR5SKzDrDwULT2wjes yMMD+sFdDFmCsBL5HQ8BJTtDLpjeyXBbTazNnaH+CvUQWYaKXmvCnmQXsIwKSq3If2PSxWu4E8D4 08bWhulxjPvNLQ7JWqZEFCEMjzUmFrv1QYdQ5+kULkF1gfxE5Byyc+sTAdW3gLzdCBCrzQa+MfNe cTYw4dvsFY7ulsyX9LIoESY2ncUXX8PXZywQ3Rj6pcmezEGcCW2mF9IPIVPRczAI42IZa4VatjB3 rghKhg+FNhTmWFXiW3WuI8URDSi6gKtlnsbrrDYE2+vlGDOsAhYlvUQ9NWxkJhjdOivCWm5tT/lB f4NxHyCLmTbs710KAcWTeeEHywSduD0HfwrsgnE4b7OfPbNBLr7RyguIGdVX+VGTyjLbuNoTbImS wMEkB+d2WzoAJGCBpVMH7JSWW+PVBR/QcCbAhLmW61T4k+/73Me6/qGh2PVIhspUBoNsNeENk8IG xpEI2PH/P1BiBFgUHzXOICrBds4j5XPGIK3tVsV8XWY3TNxLfW47ZA7ciwl2IT3r7x5EKqAw2Qpx Ju9HKAfmuSUqV54YeyO5p4T8Wt/9W6diyunT8px0wHz6KkxzxERKWaJTB7wblSKbEyyxHgD1xoxH CKZZF1NMMIbmYanl7oGe4fKIs5l5eZpY3BJZpmmsCQNEav9zzjsdEa+AfOgZNkNUiQ/Cg2/zvsBQ YLklCdEr4h+Cq0a0z0sRsfj2GusK3D2QZlgw4G8PX8Fbvn8YEZgpfAqkevywCkaO+IKNvQh7QcsO mMR2m/wN4qPqkPY6nTx8+1BEGTgRIiRLuKn/weXFk/RPTd3GRGSS0HIiUUbTPqofGDVDNUH+25P1 snqs45BXfBCsZq3OMcYYNrIDB1KWrTj1axh+fv412FmM/brnxspQ== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Mar 2024 10:44:23 +0800 X-OQ-MSGID: <20240324024423.62209-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/file: Fix duplicate symbol ff_jni_* 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: Zhao Zhili 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: From: Zhao Zhili --- libavformat/Makefile | 1 + libavformat/ffjni.c | 1 + libavformat/file.c | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 libavformat/ffjni.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 44aa485029..e10ad436a8 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -724,6 +724,7 @@ OBJS-$(CONFIG_LIBZMQ_PROTOCOL) += libzmq.o # Objects duplicated from other libraries for shared builds SHLIBOBJS += log2_tab.o to_upper4.o +SHLIBOBJS-$(CONFIG_ANDROID_CONTENT_PROTOCOL) += ffjni.o SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o diff --git a/libavformat/ffjni.c b/libavformat/ffjni.c new file mode 100644 index 0000000000..a5285564b2 --- /dev/null +++ b/libavformat/ffjni.c @@ -0,0 +1 @@ +#include "libavcodec/ffjni.c" diff --git a/libavformat/file.c b/libavformat/file.c index dd5819c06f..f80cb4b37a 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -41,9 +41,8 @@ #include "os_support.h" #include "url.h" #if CONFIG_ANDROID_CONTENT_PROTOCOL -#include +#include "libavcodec/ffjni.h" #include "libavcodec/jni.h" -#include "libavcodec/ffjni.c" #endif -- 2.34.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".