From fc8435ee6d830070c72913224f10ffa10c0d4323 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 25 Jan 2009 23:31:45 +0000
Subject: Drop dev- prefix from printed version number, just SVN-rXXXXX is
 enough.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28367 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 version.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.sh b/version.sh
index 50a757c333..34c65a34ed 100755
--- a/version.sh
+++ b/version.sh
@@ -7,9 +7,9 @@ test $svn_revision || svn_revision=`grep revision .svn/entries 2>/dev/null | cut
 test $svn_revision || svn_revision=`sed -n -e '/^dir$/{n;p;q;}' .svn/entries 2>/dev/null`
 test $svn_revision || svn_revision=UNKNOWN
 
-NEW_REVISION="#define VERSION \"dev-SVN-r${svn_revision}${extra}\""
+NEW_REVISION="#define VERSION \"SVN-r${svn_revision}${extra}\""
 OLD_REVISION=`cat version.h 2> /dev/null`
-TITLE="#define MP_TITLE \"%s dev-SVN-r${svn_revision}${extra} (C) 2000-2009 MPlayer Team\\\n\""
+TITLE="#define MP_TITLE \"%s SVN-r${svn_revision}${extra} (C) 2000-2009 MPlayer Team\\\n\""
 
 # Update version.h only on revision changes to avoid spurious rebuilds
 if test "$NEW_REVISION" != "$OLD_REVISION"; then
-- 
cgit v1.2.3


From 7034529d9ae9b593ebbac187e983a1b7bde5be83 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 25 Jan 2009 23:55:21 +0000
Subject: Fix build: Add required header and adjust preprocessor check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28368 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libaf/af_format.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libaf/af_format.c b/libaf/af_format.c
index fdac68147e..5e53c1ae99 100644
--- a/libaf/af_format.c
+++ b/libaf/af_format.c
@@ -26,8 +26,9 @@
 #include <inttypes.h>
 #include <limits.h>
 
+#include "config.h"
 // Integer to float conversion through lrintf()
-#ifdef HAVE_LRINTF
+#if HAVE_LRINTF
 #include <math.h>
 long int lrintf(float);
 #else
-- 
cgit v1.2.3