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 /libavcodec | |
| 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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 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 |