aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-24 12:30:10 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-24 12:30:55 +0200
commit2896b981830ec5835732c044a2f6c606ee9fd5e6 (patch)
tree70acce4dd8068e04843a986c79a6614cbfb369d3
parent872e087305a46377b77eaedc4e90d4ab451ae7be (diff)
parentd0c093021943e9b9c23528b12cd61ca2a5b01b4f (diff)
downloadffmpeg-2896b981830ec5835732c044a2f6c606ee9fd5e6.tar.gz
Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'
* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f': avconv: Use av_gettime_relative Conflicts: ffmpeg.c See: 76191c08f88fd66cf9198afc0c4a809c4c0336d4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index e6ba0f6a10..0c78fd52f8 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3780,7 +3780,7 @@ static int64_t getutime(void)
GetProcessTimes(proc, &c, &e, &k, &u);
return ((int64_t) u.dwHighDateTime << 32 | u.dwLowDateTime) / 10;
#else
- return av_gettime();
+ return av_gettime_relative();
#endif
}