X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=6f72b2c2e6ee66aad29379da5a4cd6428a622c58;hb=5405584b7b54ca889c341743de1d58792449830d;hp=b34ee2c88ca263a7098da3e3ae47a86c6e72d4ca;hpb=203df50d1013ea59e558d63f3ea69ffae1249124;p=ffmpeg

diff --git a/version.sh b/version.sh
index b34ee2c88ca..6f72b2c2e6e 100755
--- a/version.sh
+++ b/version.sh
@@ -1,16 +1,10 @@
 #!/bin/sh
 
-revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
-test "$revision" && revision=SVN-r$revision
-
 # check for git short hash
-if ! test "$revision"; then
-    revision=$(cd "$1" && git describe --always 2> /dev/null)
-    test "$revision" && revision=git-$revision
-fi
+revision=$(cd "$1" && git describe --always 2> /dev/null)
 
 # no revision number found
-test "$revision" || revision=UNKNOWN
+test "$revision" || revision=$(cd "$1" && cat RELEASE 2> /dev/null)
 
 # releases extract the version number from the VERSION file
 version=$(cd "$1" && cat VERSION 2> /dev/null)
@@ -23,7 +17,7 @@ if [ -z "$2" ]; then
     exit
 fi
 
-NEW_REVISION="#define FFMPEG_VERSION \"$version\""
+NEW_REVISION="#define LIBAV_VERSION \"$version\""
 OLD_REVISION=$(cat version.h 2> /dev/null)
 
 # Update version.h only on revision changes to avoid spurious rebuilds