[FFmpeg-cvslog] r9627 - in trunk: configure ffmpeg.c

[Aurelien Jacobs]

On Fri, 13 Jul 2007 18:04:00 +0200 (CEST)
ramiro <subversion at mplayerhq.hu> wrote:

> Author: ramiro
> Date: Fri Jul 13 18:04:00 2007
> New Revision: 9627
> 
> Log:
> Check for getrusage
> 
> Modified:
>    trunk/configure
>    trunk/ffmpeg.c
> 
> Modified: trunk/configure
> ==============================================================================
> --- trunk/configure	(original)
> +++ trunk/configure	Fri Jul 13 18:04:00 2007
> @@ -667,6 +667,7 @@ HAVE_LIST="
>      fast_unaligned
>      fork
>      freetype2
> +    getrusage
>      imlib2
>      inet_aton
>      lrintf
> @@ -1596,6 +1597,8 @@ elif check_func dlopen -ldl; then
>      ldl=-ldl
>  fi
>  
> +check_func getrusage
> +
>  check_func fork
>  
>  test "$vhook" = "default" && vhook="$dlopen"
> 
> Modified: trunk/ffmpeg.c
> ==============================================================================
> --- trunk/ffmpeg.c	(original)
> +++ trunk/ffmpeg.c	Fri Jul 13 18:04:00 2007
> @@ -3113,10 +3113,12 @@ static int64_t getutime(void)
>  #else
>  static int64_t getutime(void)
>  {
> +#ifdef HAVE_GETRUSAGE
>      struct rusage rusage;
>  
>      getrusage(RUSAGE_SELF, &rusage);
>      return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
> +#endif
>  }

If HAVE_GETRUSAGE is not defined, this function is still supposed
to return an int64_t. So it's missing a return statement.

Aurel