diff --git a/build_tc.sh b/build_tc.sh index be2163d..e47f520 100644 --- a/build_tc.sh +++ b/build_tc.sh @@ -4,7 +4,6 @@ STEP=$1 MODE=$2 CPU_CORES=$3 ENABLED_TOOLS=$4 -FFBRANCH=$5 SRC=`realpath src` BUILD=`realpath build` @@ -144,9 +143,14 @@ elif [ "$STEP" == "ffmpeg" ]; then echo "### Applying patches ..." cd $SRC/ffmpeg - + + echo "- patch #1 ..." patch -N -p1 -i ../../patches/0001-dynamic-loading-of-shared-fdk-aac-library.patch - if [ "$FFBRANCH" == "release/4.0" ]; then + + ffbranch=$(git rev-parse --abbrev-ref HEAD) + echo "Branch: $ffbranch" + if [ "$ffbranch" == "release/4.0" ]; then + echo "- patch #2 ..." patch -N -p0 -i ../../patches/0002-patch-ffmpeg-to-new-fdk-api.patch fi