| Index: webrtc/video_receive_stream.h
 | 
| diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h
 | 
| index f8e9888eda412d5f387b5c601ca3d4b27af8bb0c..410d5aff7f62adcec88ab455b79de43cd9b64303 100644
 | 
| --- a/webrtc/video_receive_stream.h
 | 
| +++ b/webrtc/video_receive_stream.h
 | 
| @@ -76,10 +76,23 @@ class VideoReceiveStream {
 | 
|    };
 | 
|  
 | 
|    struct Config {
 | 
| +   private:
 | 
| +    // Access to the copy constructor is private to force use of the Copy()
 | 
| +    // method for those exceptional cases where we do use it.
 | 
| +    Config(const Config&) = default;
 | 
| +
 | 
| +   public:
 | 
|      Config() = delete;
 | 
| +    Config(Config&&) = default;
 | 
|      explicit Config(Transport* rtcp_send_transport)
 | 
|          : rtcp_send_transport(rtcp_send_transport) {}
 | 
|  
 | 
| +    Config& operator=(Config&&) = default;
 | 
| +    Config& operator=(const Config&) = delete;
 | 
| +
 | 
| +    // Mostly used by tests.  Avoid creating copies if you can.
 | 
| +    Config Copy() const { return Config(*this); }
 | 
| +
 | 
|      std::string ToString() const;
 | 
|  
 | 
|      // Decoders for every payload that we can receive.
 | 
| 
 |