X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=f8b111cc72287beb4173f6dd9d7e91437fec1572;hb=540c5220ffafce9038b1f0c96cb02382d0ab126e;hp=e4abf7200d214366d0f5604b01dce6eca5541379;hpb=7a68f7fa22861be70e983db01dad9960a762031a;p=ffmpeg

diff --git a/version.sh b/version.sh
index e4abf7200d2..f8b111cc722 100755
--- a/version.sh
+++ b/version.sh
@@ -1,11 +1,21 @@
 #!/bin/sh
 
-svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
-test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
-test $svn_revision || svn_revision=UNKNOWN
+# check for SVN revision number
+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=SVN-r$revision
 
-NEW_REVISION="#define FFMPEG_VERSION \"SVN-r$svn_revision\""
+# check for git short hash
+if ! test $revision; then
+    revision=`cd "$1" && git log -1 --pretty=format:%h`
+    test $revision && revision=git-$revision
+fi
+
+# no version number found
+test $revision || revision=UNKNOWN
+
+NEW_REVISION="#define FFMPEG_VERSION \"$revision\""
 OLD_REVISION=`cat version.h 2> /dev/null`
 
 # Update version.h only on revision changes to avoid spurious rebuilds