Don't override flat SSE2 dequant functions with non-flat AVX ones

[x264] / version.sh

diff --git a/version.sh b/version.sh
index c8778470f6fa4db327a4cab452376cbbe8e10f84..7f06c7c5f4f7b3205b6460581d5723d23c7514d9 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -5,15 +5,16 @@ 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
+    fi
+    if 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
+    VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"
+    echo "#define X264_VERSION \" r$VER\""
 else
-    echo "#define X264_VERSION \"\"" >> config.h
+    echo "#define X264_VERSION \"\""
     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
+echo "#define X264_POINTVER \"0.$API.$VER\""