lavc: move SANE_NB_CHANNELS to internal.h and use it in the PCM decoders

[ffmpeg] / version.sh

diff --git a/version.sh b/version.sh
index 3269e038a7ae0bbe4e9f55393109b44786af37ba..6f72b2c2e6ee66aad29379da5a4cd6428a622c58 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,29 +1,10 @@
 #!/bin/sh
 
-# check for SVN revision number
-revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
-test "$revision" || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep "Last Changed Rev" | cut -d' ' -f4)
-test "$revision" || revision=$(cd "$1" && grep committed-rev .svn/entries 2>/dev/null | head -n 1 | 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
-
-# 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 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)
@@ -36,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