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.
Showing the changes to libavcodec (1 of 4 files). Show all
Unified · Split
| @@ -1067,6 +1067,7 @@ STLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o · 1066 unmodified lines | ||
| 1067 | 1067 | STLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o |
| 1068 | 1068 | STLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o |
| 1069 | 1069 | STLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o |
| 1070 | +STLIBOBJS-$(CONFIG_JNI) += ffjni.o | |
| 1070 | 1071 | STLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o |
| 1071 | 1072 | STLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o |
| 1072 | 1073 | STLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o |