| Index: webrtc/api/java/jni/androidmediacodeccommon.h
|
| diff --git a/webrtc/api/java/jni/androidmediacodeccommon.h b/webrtc/api/java/jni/androidmediacodeccommon.h
|
| index 2f9e05d1f54570735c4d6f86dcd872bb68a38b64..db7260ade55c422edc3c1055006a07a2963fd2fa 100644
|
| --- a/webrtc/api/java/jni/androidmediacodeccommon.h
|
| +++ b/webrtc/api/java/jni/androidmediacodeccommon.h
|
| @@ -19,7 +19,6 @@
|
| #include "webrtc/api/java/jni/jni_helpers.h"
|
| #include "webrtc/base/logging.h"
|
| #include "webrtc/base/thread.h"
|
| -#include "webrtc/system_wrappers/include/tick_util.h"
|
|
|
| namespace webrtc_jni {
|
|
|
| @@ -59,10 +58,6 @@ enum { kMaxDecodedLogFrames = 10 };
|
| // Maximum amount of encoded frames for which per-frame logging is enabled.
|
| enum { kMaxEncodedLogFrames = 10 };
|
|
|
| -static inline int64_t GetCurrentTimeMs() {
|
| - return webrtc::TickTime::Now().Ticks() / 1000000LL;
|
| -}
|
| -
|
| static inline void AllowBlockingCalls() {
|
| rtc::Thread* current_thread = rtc::Thread::Current();
|
| if (current_thread != NULL)
|
|
|