os2 support patch by ("Slavik Gnatenko" <miracle9 at newmail dot ru>)
Originally committed as revision 1447 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:

committed by
Michael Niedermayer

parent
143cc72527
commit
f3ec2d46ba
17
ffmpeg.c
17
ffmpeg.c
@@ -28,6 +28,11 @@
|
||||
#include <termios.h>
|
||||
#include <sys/resource.h>
|
||||
#endif
|
||||
#ifdef CONFIG_OS2
|
||||
#include <sys/types.h>
|
||||
#include <sys/select.h>
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
#include <ctype.h>
|
||||
|
||||
@@ -2497,7 +2502,12 @@ void opt_pass(const char *pass_str)
|
||||
do_pass = pass;
|
||||
}
|
||||
|
||||
#ifndef CONFIG_WIN32
|
||||
#if defined(CONFIG_WIN32) || defined(CONFIG_OS2)
|
||||
INT64 getutime(void)
|
||||
{
|
||||
return av_gettime();
|
||||
}
|
||||
#else
|
||||
INT64 getutime(void)
|
||||
{
|
||||
struct rusage rusage;
|
||||
@@ -2505,11 +2515,6 @@ INT64 getutime(void)
|
||||
getrusage(RUSAGE_SELF, &rusage);
|
||||
return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
|
||||
}
|
||||
#else
|
||||
INT64 getutime(void)
|
||||
{
|
||||
return av_gettime();
|
||||
}
|
||||
#endif
|
||||
|
||||
extern int ffm_nopts;
|
||||
|
Reference in New Issue
Block a user