Make code using 1d-DCT consistent with the API change

[ffmpeg] / version.sh

diff --git a/version.sh b/version.sh
index 5b5f451534a227ff0575c7786c20170ee051ff2a..774e514c22fcba06e209e979e6ed2a2435d1aae8 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -2,8 +2,8 @@
 
 # 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 Revision | cut -d' ' -f2)
-test $revision || revision=$(cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2)
+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
@@ -12,13 +12,13 @@ test $revision && revision=SVN-r$revision
 
 # check for git svn revision number
 if ! test $revision; then
-    revision=$(cd "$1" && git svn find-rev HEAD)
+    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)
+    revision=$(cd "$1" && git log -1 --pretty=format:%h 2> /dev/null)
     test $revision && revision=git-$revision
 fi