Fix incorrectly constructed Dirac parse units that caused A/V sync loss.

[ffmpeg] / version.sh

diff --git a/version.sh b/version.sh
index e4abf7200d214366d0f5604b01dce6eca5541379..69a10ea1c5d346c2f024366e2451e08efe71dce3 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,14 +1,26 @@
 #!/bin/sh
 
-svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
-test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
-test $svn_revision || svn_revision=UNKNOWN
+# 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
 
-NEW_REVISION="#define FFMPEG_VERSION \"SVN-r$svn_revision\""
+# check for git short hash
+if ! test $revision; then
+    revision=`cd "$1" && git log -1 --pretty=format:%h`
+    test $revision && revision=git-$revision
+fi
+
+# no version number found
+test $revision || revision=UNKNOWN
+
+test -n "$3" && revision=$revision-$3
+
+NEW_REVISION="#define FFMPEG_VERSION \"$revision\""
 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