RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f' 

* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f':
  avconv: Use av_gettime_relative

Conflicts:
	ffmpeg.c

See: 76191c08f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-24 12:30:10 +02:00
parent 872e087305 d0c0930219
commit 2896b98183
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -3780,7 +3780,7 @@ static int64_t getutime(void)
GetProcessTimes(proc, &c, &e, &k, &u); GetProcessTimes(proc, &c, &e, &k, &u);
return ((int64_t) u.dwHighDateTime << 32 | u.dwLowDateTime) / 10; return ((int64_t) u.dwHighDateTime << 32 | u.dwLowDateTime) / 10;
#else #else
return av_gettime(); return av_gettime_relative();
#endif #endif
} }