| Index: webrtc/config.h
|
| diff --git a/webrtc/config.h b/webrtc/config.h
|
| index 3b3c3d90a811234515dd0348fe44da8be153ff1d..4ec895b0dd8265b34043a75cb082575ffb29dc7f 100644
|
| --- a/webrtc/config.h
|
| +++ b/webrtc/config.h
|
| @@ -57,8 +57,8 @@
|
| // Settings for FlexFEC forward error correction.
|
| // Set the payload type to '-1' to disable.
|
| struct FlexfecConfig {
|
| - FlexfecConfig();
|
| - ~FlexfecConfig();
|
| + FlexfecConfig()
|
| + : flexfec_payload_type(-1), flexfec_ssrc(0), protected_media_ssrcs() {}
|
| std::string ToString() const;
|
|
|
| // Payload type of FlexFEC.
|
| @@ -163,7 +163,7 @@
|
| virtual void FillVideoCodecVp9(VideoCodecVP9* vp9_settings) const;
|
| virtual void FillVideoCodecH264(VideoCodecH264* h264_settings) const;
|
| private:
|
| - ~EncoderSpecificSettings() override {}
|
| + virtual ~EncoderSpecificSettings() {}
|
| friend class VideoEncoderConfig;
|
| };
|
|
|
| @@ -211,7 +211,7 @@
|
| const VideoEncoderConfig& encoder_config) = 0;
|
|
|
| protected:
|
| - ~VideoStreamFactoryInterface() override {}
|
| + virtual ~VideoStreamFactoryInterface() {}
|
| };
|
|
|
| VideoEncoderConfig& operator=(VideoEncoderConfig&&) = default;
|
| @@ -221,7 +221,7 @@
|
| VideoEncoderConfig Copy() const { return VideoEncoderConfig(*this); }
|
|
|
| VideoEncoderConfig();
|
| - VideoEncoderConfig(VideoEncoderConfig&&);
|
| + VideoEncoderConfig(VideoEncoderConfig&&) = default;
|
| ~VideoEncoderConfig();
|
| std::string ToString() const;
|
|
|
| @@ -243,7 +243,7 @@
|
| private:
|
| // Access to the copy constructor is private to force use of the Copy()
|
| // method for those exceptional cases where we do use it.
|
| - VideoEncoderConfig(const VideoEncoderConfig&);
|
| + VideoEncoderConfig(const VideoEncoderConfig&) = default;
|
| };
|
|
|
| struct VideoDecoderH264Settings {
|
| @@ -252,8 +252,7 @@
|
|
|
| class DecoderSpecificSettings {
|
| public:
|
| - DecoderSpecificSettings();
|
| - virtual ~DecoderSpecificSettings();
|
| + virtual ~DecoderSpecificSettings() {}
|
| rtc::Optional<VideoDecoderH264Settings> h264_extra_settings;
|
| };
|
|
|
|
|