tiff: add support for SamplesPerPixel tag in tiff_decode_tag()

[ffmpeg] / version.sh

diff --git a/version.sh b/version.sh
index 4721a711be7068c3d4131b5acd5f1359a8c33107..6ec2b2567ead072ae77bd77edaf6414c4eedf30f 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,12 +1,27 @@
 #!/bin/sh
 
-svn_revision=`cd "$1" && svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-test $svn_revision || svn_revision=UNKNOWN
+# check for git short hash
+revision=$(cd "$1" && git describe --always 2> /dev/null)
+test "$revision" && revision=git-$revision
 
-NEW_REVISION="#define FFMPEG_VERSION \"SVN-r$svn_revision\""
-OLD_REVISION=`cat version.h 2> /dev/null`
+# no revision number found
+test "$revision" || revision=UNKNOWN
+
+# releases extract the version number from the VERSION file
+version=$(cd "$1" && cat VERSION 2> /dev/null)
+test "$version" || version=$revision
+
+test -n "$3" && version=$version-$3
+
+if [ -z "$2" ]; then
+    echo "$version"
+    exit
+fi
+
+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
 if test "$NEW_REVISION" != "$OLD_REVISION"; then
-    echo "$NEW_REVISION" > version.h
+    echo "$NEW_REVISION" > "$2"
 fi