Simplify slicetype_frame_cost

[x264] / version.sh

diff --git a/version.sh b/version.sh
index 8aca7af4532f90e2fe06261a119a0c2d8d49e25f..c8778470f6fa4db327a4cab452376cbbe8e10f84 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,8 +1,19 @@
-#!/bin/sh
-VER=`svnversion .`
-if [ "x$VER" != x -a "$VER" != exported ]
-then
-  echo "#define X264_VERSION \" svn-$VER\"" > config.h
+#!/bin/bash
+git rev-list HEAD | sort > config.git-hash
+LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
+if [ $LOCALVER \> 1 ] ; then
+    VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
+    if [ $VER != $LOCALVER ] ; then
+        VER="$VER+$(($LOCALVER-$VER))"
+    elif git status | grep -q "modified:" ; then
+        VER="${VER}M"
+    fi
+    VER="$VER $(git rev-list HEAD -n 1 | head -c 7)"
+    echo "#define X264_VERSION \" r$VER\"" >> config.h
 else
-  echo "#define X264_VERSION \"\"" > config.h
+    echo "#define X264_VERSION \"\"" >> config.h
+    VER="x"
 fi
+rm -f config.git-hash
+API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
+echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h