mkvdec: Avoid divide-by-zero crash on invalid real audio tracks

[ffmpeg] / version.sh

diff --git a/version.sh b/version.sh
index 06991c4b8bba1d585fcb58f623c5c33c2a9e7524..70679cc7f0e249c000e667d4a4d45cae6e2813bc 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,18 +1,40 @@
 #!/bin/sh
 
 # 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`
+revision=$(cd "$1" && 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=SVN-r$revision
 
-# no version number found
+# check for git svn revision number
+if ! test $revision; then
+    revision=$(cd "$1" && git svn find-rev HEAD 2> /dev/null)
+    test $revision && revision=git-svn-r$revision
+fi
+
+# check for git short hash
+if ! test $revision; then
+    revision=$(cd "$1" && git log -1 --pretty=format:%h 2> /dev/null)
+    test $revision && revision=git-$revision
+fi
+
+# no revision number found
 test $revision || revision=UNKNOWN
 
-NEW_REVISION="#define FFMPEG_VERSION \"$revision\""
-OLD_REVISION=`cat version.h 2> /dev/null`
+# 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
+
+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
 if test "$NEW_REVISION" != "$OLD_REVISION"; then
-    echo "$NEW_REVISION" > version.h
+    echo "$NEW_REVISION" > "$2"
 fi