[FFmpeg-cvslog] r9627 - in trunk: configure ffmpeg.c
Ramiro Ribeiro Polla
ramiro
Fri Jul 13 21:45:52 CEST 2007
Aurelien Jacobs wrote:
> 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/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.
>
>
I split one patch in 3 parts. The final output is correct.
I made a bad choice into how to split it. They weren't very consistent
in between, but that was just for a few minutes.
I hope no one with a system that doesn't have getrusage, but also isn't
MinGW did a checkout in that mean time =)
Ramiro Polla
More information about the ffmpeg-cvslog
mailing list