Skip to content

Commit d89dafb

Browse files
committed
shared build for ffmbc included
1 parent 7dcdf1b commit d89dafb

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

cross_compile_ffmpeg.sh

+17-7
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,20 @@ fflight=false
5454
# Ask me questions and show the intro or run only with options configured above! (default: true)
5555
askmequestions=true
5656
###
57-
if ${ffmbc}
57+
echo $1
58+
if ${ffmbc} || [[ $1 -eq "ffmbc" ]]
5859
then
59-
ffvanilla=true
60-
ffnonfree=false
60+
ffmbc=true
61+
if [[ $2 -eq "full" ]]
62+
then
63+
ffvanilla=false
64+
ffnonfree=true
65+
ffshared=true
66+
ffstatic=true
67+
else
68+
ffvanilla=true
69+
ffnonfree=false
70+
fi
6171
askmequestions=false
6272
ffmpeg=false
6373
fflight=false
@@ -761,23 +771,23 @@ build_ffmbc() {
761771
echo -e "${PASS}Already patched ${file2patch} ${RST}"
762772
else
763773
echo -e "${INFO}Patching ${file2patch} ${RST}"
764-
#sed -i '28 i#include \"dxva.h\"' $file2patch
774+
sed -i '28 i#include \"dxva.h\"' $file2patch
765775
fi
766776
file2patch="libavdevice/dshow_filter.c"
767777
if grep -Fxq "#define NO_DSHOW_STRSAFE" $file2patch
768778
then
769779
echo -e "${PASS}Already patched ${file2patch} ${RST}"
770780
else
771781
echo -e "${INFO}Patching ${file2patch} ${RST}"
772-
#sed -i '22 i#define NO_DSHOW_STRSAFE' $file2patch
782+
sed -i '22 i#define NO_DSHOW_STRSAFE' $file2patch
773783
fi
774784
local file2patch="libavdevice/dshow_pin.c"
775785
if grep -Fxq "#define NO_DSHOW_STRSAFE" $file2patch
776786
then
777787
echo -e "${PASS}Already patched ${file2patch} ${RST}"
778788
else
779789
echo -e "${INFO}Patching ${file2patch} ${RST}"
780-
#sed -i '22 i#define NO_DSHOW_STRSAFE' $file2patch
790+
sed -i '22 i#define NO_DSHOW_STRSAFE' $file2patch
781791
fi
782792

783793
if [[ "$1" = "shared" ]]
@@ -1025,7 +1035,7 @@ build_all() {
10251035
if $ffbuildshared
10261036
then
10271037
# only build vanilla shared libs, as others failATM
1028-
if $ffmbc && $ffvanilla
1038+
if $ffmbc #&& $ffvanilla
10291039
then
10301040
build_ffmbc shared
10311041
fi

0 commit comments

Comments
 (0)