| Index: webrtc/modules/video_coding/generic_encoder.h
 | 
| diff --git a/webrtc/modules/video_coding/generic_encoder.h b/webrtc/modules/video_coding/generic_encoder.h
 | 
| index 469f04ded40bdd47890d0b74816e344a038ec12a..0493d319aa93e99a69331c7afbc7bd8cd69d0957 100644
 | 
| --- a/webrtc/modules/video_coding/generic_encoder.h
 | 
| +++ b/webrtc/modules/video_coding/generic_encoder.h
 | 
| @@ -18,6 +18,7 @@
 | 
|  #include "webrtc/modules/video_coding/include/video_coding_defines.h"
 | 
|  
 | 
|  #include "webrtc/base/criticalsection.h"
 | 
| +#include "webrtc/base/race_checker.h"
 | 
|  
 | 
|  namespace webrtc {
 | 
|  class CriticalSectionWrapper;
 | 
| @@ -82,7 +83,9 @@ class VCMGenericEncoder {
 | 
|    bool SupportsNativeHandle() const;
 | 
|  
 | 
|   private:
 | 
| -  VideoEncoder* const encoder_;
 | 
| +  rtc::RaceChecker race_checker_;
 | 
| +
 | 
| +  VideoEncoder* const encoder_ GUARDED_BY(race_checker_);
 | 
|    VideoEncoderRateObserver* const rate_observer_;
 | 
|    VCMEncodedFrameCallback* const vcm_encoded_frame_callback_;
 | 
|    const bool internal_source_;
 | 
| 
 |