diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-07-16 14:53:18 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-07-16 14:53:18 +0000 |
| commit | f3d27028ce9a280c02c286f9b98adf1e476c03d2 (patch) | |
| tree | dca7e434477e7454b81894977f75e455af4cc0dc /modules/video_coding/main/source/timing.cc | |
| parent | 477e6bce6816b8bb433c2e6c44b377bdc766a3b3 (diff) | |
| parent | 82383d9b14ff8e5fedf5a70229eb0ac6b512909a (diff) | |
| download | webrtc-f3d27028ce9a280c02c286f9b98adf1e476c03d2.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 82383d9b14ff8e5fedf5a70229eb0ac6b512909a
This commit was generated by merge_from_chromium.py.
Change-Id: I8c578be801fa38420e875a4a8cef17e7522252e2
Diffstat (limited to 'modules/video_coding/main/source/timing.cc')
| -rw-r--r-- | modules/video_coding/main/source/timing.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/video_coding/main/source/timing.cc b/modules/video_coding/main/source/timing.cc index af0e35c4..2ec149ce 100644 --- a/modules/video_coding/main/source/timing.cc +++ b/modules/video_coding/main/source/timing.cc @@ -58,6 +58,7 @@ void VCMTiming::Reset() { } void VCMTiming::ResetDecodeTime() { + CriticalSectionScoped lock(crit_sect_); codec_timer_.Reset(); } |