diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 01:57:38 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 01:57:41 +0200 |
| commit | 03aa64687fc109c5f2346a3c191b70698b333509 (patch) | |
| tree | 03cfac7d56be327094c2bfcaf115691e75bf611e | |
| parent | dd888b05ff3af1c6c35582e75bedae687d38fc66 (diff) | |
| parent | 7034529d9ae9b593ebbac187e983a1b7bde5be83 (diff) | |
| download | mpv-03aa64687fc109c5f2346a3c191b70698b333509.tar.bz2 mpv-03aa64687fc109c5f2346a3c191b70698b333509.tar.xz | |
Merge svn changes up to r28368
Fixes af_format.c compilation bug exposed by latest FFmpeg change.
| -rw-r--r-- | libaf/af_format.c | 3 | ||||
| -rwxr-xr-x | version.sh | 4 |
2 files changed, 4 insertions, 3 deletions
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 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 |