diff options
| author | Leo Izen <leo.izen@gmail.com> | 2024-03-27 09:06:19 -0400 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@gmail.com> | 2024-04-04 21:51:21 +0200 |
| commit | 7c338f470f869978efa3ec161c5f28fa83840c00 (patch) | |
| tree | 6c89d45d113b1b13b0fc1b3ac273dce2ef79a58d | |
| parent | bf3b74142e4402912e26b5e58a0b63f87ec3cd21 (diff) | |
| download | ffmpeg-7c338f470f869978efa3ec161c5f28fa83840c00.tar.gz | |
avcodec, avformat/ffjni: fix duplicate JNI symbols
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 <leo.izen@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/ffjni.c | 23 | ||||
| -rw-r--r-- | libavformat/file.c | 2 |
4 files changed, 26 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 578d8631a4..7f6de4470e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1067,6 +1067,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 5d77cba7f1..9981799cc9 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -729,6 +729,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 <leo.izen@gmail.com> + * + * 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 670481d7b4..0b7452bc20 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -528,8 +528,8 @@ const URLProtocol ff_fd_protocol = { #if CONFIG_ANDROID_CONTENT_PROTOCOL #include <jni.h> +#include "libavcodec/ffjni.h" #include "libavcodec/jni.h" -#include "libavcodec/ffjni.c" typedef struct JFields { jclass uri_class; |