Do not add the preamble if the DTS stream is already padded, like DTS in

[ffmpeg] / version.sh

diff --git a/version.sh b/version.sh
index 5b5f451534a227ff0575c7786c20170ee051ff2a..f8510ea28ccfbc36959cf9b4234261a06b2a3313 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
 
@@ -31,6 +31,11 @@ test $version || 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)