add missed merges (#47)

Author: santhoshvai

media/engine/webrtc_video_engine.h

@@ -286,6 +286,7 @@ class WebRtcVideoSendChannel : public MediaChannelUtil,
     }
     return send_codec()->rtx_time;
   }
+
  private:
   struct ChangedSenderParameters {
     // These optionals are unset if not changed.
@@ -718,9 +719,6 @@ class WebRtcVideoReceiveChannel : public MediaChannelUtil,
     void SetDepacketizerToDecoderFrameTransformer(
         scoped_refptr<FrameTransformerInterface> frame_transformer);
 
-    void StartStream();
-    void StopStream();
-
     void SetLocalSsrc(uint32_t local_ssrc);
     void UpdateRtxSsrc(uint32_t ssrc);
     void StartReceiveStream();