Revision f3ec2d46 ffmpeg.c

View differences:

ffmpeg.c
28 28
#include <termios.h>
29 29
#include <sys/resource.h>
30 30
#endif
31
#ifdef CONFIG_OS2
32
#include <sys/types.h>
33
#include <sys/select.h>
34
#include <stdlib.h>
35
#endif
31 36
#include <time.h>
32 37
#include <ctype.h>
33 38

  
......
2497 2502
    do_pass = pass;
2498 2503
}
2499 2504

  
2500
#ifndef CONFIG_WIN32
2505
#if defined(CONFIG_WIN32) || defined(CONFIG_OS2)
2501 2506
INT64 getutime(void)
2502 2507
{
2503
    struct rusage rusage;
2504

  
2505
    getrusage(RUSAGE_SELF, &rusage);
2506
    return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
2508
  return av_gettime();
2507 2509
}
2508 2510
#else
2509 2511
INT64 getutime(void)
2510 2512
{
2511
  return av_gettime();
2513
    struct rusage rusage;
2514

  
2515
    getrusage(RUSAGE_SELF, &rusage);
2516
    return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
2512 2517
}
2513 2518
#endif
2514 2519

  

Also available in: Unified diff