X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=250caef007e2ed898515ca354a3b83865eb8f3d0;hb=892d7e78ef12404db31adf440c30df73bb4890e5;hp=adaa46aa913ac83fcabd69f4ed24e6d479f957b4;hpb=2b229186a27861c850370681438a8425b37a3710;p=ffmpeg

diff --git a/version.sh b/version.sh
index adaa46aa913..250caef007e 100755
--- a/version.sh
+++ b/version.sh
@@ -4,7 +4,10 @@
 revision=$(cat snapshot_version 2> /dev/null)
 test $revision || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
 test $revision || revision=$(cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2)
-test $revision || revision=$(cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null)
+test $revision || revision=$(cd "$1" && sed -n -e '/^dir$/{n
+p
+q
+}' .svn/entries 2>/dev/null)
 test $revision && revision=SVN-r$revision
 
 # check for git short hash
@@ -13,12 +16,16 @@ if ! test $revision; then
     test $revision && revision=git-$revision
 fi
 
-# no version number found
+# no revision number found
 test $revision || revision=UNKNOWN
 
-test -n "$3" && revision=$revision-$3
+# releases extract the version number from the VERSION file
+version=$(cat VERSION 2> /dev/null)
+test $version || version=$revision
 
-NEW_REVISION="#define FFMPEG_VERSION \"$revision\""
+test -n "$3" && version=$version-$3
+
+NEW_REVISION="#define FFMPEG_VERSION \"$version\""
 OLD_REVISION=$(cat version.h 2> /dev/null)
 
 # Update version.h only on revision changes to avoid spurious rebuilds