virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Move av_gettime() back to lavf/utils.c

Browse Source 
Originally committed as revision 9706 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2007-07-16 20:28:43 +00:00
parent c993a83131
commit 82e4ac2c97
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/os_support.c
View File

@ -25,8 +25,6 @@
#include <unistd.h>
#include <fcntl.h>
#endif
#include <sys/time.h>
#include <time.h>
#ifndef HAVE_SYS_POLL_H
#if defined(__MINGW32__)
@ -36,16 +34,6 @@
#endif
#endif
/**
* gets the current time in micro seconds.
*/
int64_t av_gettime(void)
{
struct timeval tv;
gettimeofday(&tv,NULL);
return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
}
#ifdef CONFIG_NETWORK
#include "network.h"

12
libavformat/utils.c
View File

@ -23,6 +23,8 @@
#include "opt.h"
#include "avstring.h"
#include "riff.h"
#include <sys/time.h>
#include <time.h>
#undef NDEBUG
#include <assert.h>
@ -2498,6 +2500,16 @@ int parse_frame_rate(int *frame_rate_num, int *frame_rate_den, const char *arg)
return ret;
}
/**
* gets the current time in micro seconds.
*/
int64_t av_gettime(void)
{
struct timeval tv;
gettimeofday(&tv,NULL);
return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
}
int64_t parse_date(const char *datestr, int duration)
{
const char *p;