RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-30 02:52:10 +00:00
Code Issues Releases Wiki Activity

Merge svn changes up to r28368

Browse Source 
Fixes af_format.c compilation bug exposed by latest FFmpeg change.
This commit is contained in:
Uoti Urpala 2009-01-26 01:57:38 +02:00
commit 03aa64687f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libaf/af_format.c
View File

@ -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

4
version.sh
View File

@ -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