History

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.

Leo Izen committed 2 years ago

Commit 7c338f41 parent bf3b7414 files · +26 −1Browse files

Showing the changes to libavcodec (1 of 4 files). Show all

Unified · Split

libavcodec/Makefile+1−0
@@ -1067,6 +1067,7 @@ STLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o · 1066 unmodified lines
10671067 STLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o
10681068 STLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o
10691069 STLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o
1070+STLIBOBJS-$(CONFIG_JNI) += ffjni.o
10701071 STLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o
10711072 STLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o
10721073 STLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t