Add audio codec 0x1600 (ADTS AAC)

[ffmpeg] / version.sh

diff --git a/version.sh b/version.sh
index 4ed540eac9e7504811b86050bdacc00caf576271..b34ee2c88ca263a7098da3e3ae47a86c6e72d4ca 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,23 +1,29 @@
 #!/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)
-test $revision && revision=SVN-r$revision
+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 log -1 --pretty=format:%h)
-    test $revision && revision=git-$revision
+if ! test "$revision"; then
+    revision=$(cd "$1" && git describe --always 2> /dev/null)
+    test "$revision" && revision=git-$revision
 fi
 
-# no version number found
-test $revision || revision=UNKNOWN
+# no revision number found
+test "$revision" || revision=UNKNOWN
 
-test -n "$3" && revision=$revision-$3
+# releases extract the version number from the VERSION file
+version=$(cd "$1" && cat VERSION 2> /dev/null)
+test "$version" || version=$revision
 
-NEW_REVISION="#define FFMPEG_VERSION \"$revision\""
+test -n "$3" && version=$version-$3
+
+if [ -z "$2" ]; then
+    echo "$version"
+    exit
+fi
+
+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