Skip to content

Commit

Permalink
libffmpeg: fix duplicated ffjni
Browse files Browse the repository at this point in the history
  • Loading branch information
wang-bin committed Mar 27, 2024
1 parent 85f6f97 commit d912cdd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ jobs:
strategy:
fail-fast: false
matrix:
config: [default,lite,lite-lto]
config: [lite,lite-lto]
steps:
- uses: actions/checkout@v4
- name: 'Restore sysroot cache'
Expand Down
2 changes: 1 addition & 1 deletion config-lite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ DEC_OPT_MOBILE="--enable-decoder=*sub*,movtext,*web*,aac*,ac3*,eac3*,alac*,ape,a
DEMUX_OPT_MOBILE="--enable-demuxer=*sub*,*ac3,*ac,*[mj]peg*,*web*,au,ape,ass,avi,concat,dnxhd,dts*,*dash*,*flv,gif,hls,h264,hevc,kux,matroska,mov,mp3,mxf,ogg,pcm*,rawvideo,rt*p,spdif,srt,vc1,v210*,wav,*pipe,image2"
ENC_OPT_MOBILE="--enable-encoder=aac,gif,h26[3-4]*,av1*,hevc*,mjpeg*,*png,opus,pcm*,prores*,rawvideo,spdif,speedhq,*jpeg,*png,vp[8-9]*,wrapped_avframe"
MUX_OPT_MOBILE="--enable-muxer=*jpeg,fifo,flv,gif,hls,h264,hevc,image2,mov,mp4,mpegts,matroska,null,pcm*,rawvideo,spdif,*pipe,*segment,webm,wav"
PROT_OPT_MOBILE="--enable-protocol=cache,concat*,crypto*,data,fd,*file,ftp,h*,i*,pipe,rt*,s*,t*,u*"
PROT_OPT_MOBILE="--enable-protocol=cache,concat*,*content,crypto*,data,fd,*file,ftp,h*,i*,pipe,rt*,s*,t*,u*"
FILTER_OPT_MOBILE="--enable-filter=*null*,afade,*fifo,*format,*resample,aeval,atempo,pan,crop,eq*,framerate,hw*,scale,volume"
PROT_OPT="${PROT_OPT_MOBILE}"
# av1: only hwaccel no native, only desktop hwaccels support av1
Expand Down
3 changes: 2 additions & 1 deletion tools/mklibffmpeg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ DUP_OBJS=(libswscale/log2_tab.o libswresample/log2_tab.o libavcodec/log2_tab.o l
libswresample/swresampleres.o
libpostproc/postprocres.o
)
grep -q ffjni.c libavformat/file.d 2>/dev/null && DUP_OBJS+=(libavcodec/ffjni.o)
OBJS=`find compat lib* -name "*.o" |grep -vE "$(join '|' ${DUP_OBJS[@]})"`
# appveyor PATH value is very large, xargs gets error "environment is too large for exec", so use echo
OBJS=$(echo -n $OBJS)
Expand Down Expand Up @@ -100,7 +101,7 @@ M = @$(call ECHO,$(TAG),$@);
IFLAGS := -I. -I$(SRC_LINK)/
# -r incompatible: -l(shared) -L -Wl,-soname -Wl,-rpath -Wl,--icf -shared -Wl,--gc-sections -dead_strip. other -Wl flags have no effect
LDRFLAGS = $(filter-out -l% -L% -Wl%, $(LDFLAGS) $(LDSOFLAGS))
FFEXTRALIBS_R = $(filter -L% -lwolfssl, $(FFEXTRALIBS))
FFEXTRALIBS_R = $(filter -L% -lwolfssl %.a, $(FFEXTRALIBS))
SHFLAGS_R = $(filter-out -shared -Wl% $$%, $(SHFLAGS)) # mingw -Wl,--disable-auto-image-base $$(@:$(SLIBSUF)=.def)'
vpath %.rc $(SRC_PATH)
Expand Down

0 comments on commit d912cdd

Please sign in to comment.