avformat/oggdec: reset end_trimming in ogg_reset()

[ffmpeg] / version.sh

diff --git a/version.sh b/version.sh
index c28ffe755750eadbed91860d0f6c7ece22ca06c2..92edcb9474ed86d641b2b2252f40f9c80399facb 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -42,9 +42,17 @@ if [ -z "$2" ]; then
 fi
 
 NEW_REVISION="#define FFMPEG_VERSION \"$version\""
-OLD_REVISION=$(cat "$2" 2> /dev/null)
+OLD_REVISION=$(cat "$2" 2> /dev/null | head -3 | tail -1)
+
+# String used for preprocessor guard
+GUARD=$(echo "$2" | sed 's/\//_/' | sed 's/\./_/' | tr '[:lower:]' '[:upper:]' | sed 's/LIB//')
 
 # Update version header only on revision changes to avoid spurious rebuilds
 if test "$NEW_REVISION" != "$OLD_REVISION"; then
-    echo "$NEW_REVISION" > "$2"
+    cat << EOF > "$2"
+#ifndef $GUARD
+#define $GUARD
+$NEW_REVISION
+#endif /* $GUARD */
+EOF
 fi