Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 7116d6c

Browse filesBrowse files
committed
version display fix
1 parent deb6c27 commit 7116d6c
Copy full SHA for 7116d6c

File tree

Expand file treeCollapse file tree

1 file changed

+7
-5
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+7
-5
lines changed

‎build-ffmpeg

Copy file name to clipboardExpand all lines: build-ffmpeg
+7-5Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# LICENSE: https://github.com/markus-perl/ffmpeg-build-script/blob/master/LICENSE
55

66
PROGNAME=$(basename "$0")
7-
SCRIPT_VERSION=1.28
7+
SCRIPT_VERSION=1.30
8+
FFMPEG_VERSION=4.4
89
CWD=$(pwd)
910
PACKAGES="$CWD/packages"
1011
WORKSPACE="$CWD/workspace"
@@ -132,7 +133,7 @@ build() {
132133
echo "======================="
133134

134135
if [ -f "$PACKAGES/$1.done" ]; then
135-
if grep -Fx "$2" "$PACKAGES/$1.done"; then
136+
if grep -Fx "$2" "$PACKAGES/$1.done" >/dev/null; then
136137
echo "$1 version $2 already built. Remove $PACKAGES/$1.done lockfile to rebuild it."
137138
return 1
138139
elif $LATEST; then
@@ -829,8 +830,8 @@ fi
829830
## FFmpeg
830831
##
831832

832-
build "ffmpeg" "4.4"
833-
download "https://github.com/FFmpeg/FFmpeg/archive/refs/heads/release/4.4.tar.gz" "FFmpeg-release-4.4.tar.gz"
833+
build "ffmpeg" "$FFMPEG_VERSION"
834+
download "https://github.com/FFmpeg/FFmpeg/archive/refs/heads/release/$FFMPEG_VERSION.tar.gz" "FFmpeg-release-$FFMPEG_VERSION.tar.gz"
834835
# shellcheck disable=SC2086
835836
./configure "${CONFIGURE_OPTIONS[@]}" \
836837
--disable-debug \
@@ -846,7 +847,8 @@ download "https://github.com/FFmpeg/FFmpeg/archive/refs/heads/release/4.4.tar.gz
846847
--extra-libs="${EXTRALIBS}" \
847848
--pkgconfigdir="$WORKSPACE/lib/pkgconfig" \
848849
--pkg-config-flags="--static" \
849-
--prefix="${WORKSPACE}"
850+
--prefix="${WORKSPACE}" \
851+
--extra-version="${FFMPEG_VERSION}"
850852

851853
execute make -j $MJOBS
852854
execute make install

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.