Make sure channels in the same call are in the same channel group.

Tested manually. I'll make a follow CL with a proper test once review.webrtc.org/5619004 has been committed.

R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/5509004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5280 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/video/video_send_stream.h

diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h
index addb045..7433e8a 100644
--- a/webrtc/video/video_send_stream.h
+++ b/webrtc/video/video_send_stream.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_VIDEO_SEND_STREAM_IMPL_H_
-#define WEBRTC_VIDEO_ENGINE_VIDEO_SEND_STREAM_IMPL_H_
+#ifndef WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
+#define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
 
 #include <vector>
 
@@ -42,7 +42,8 @@
   VideoSendStream(newapi::Transport* transport,
                   bool overuse_detection,
                   webrtc::VideoEngine* video_engine,
-                  const VideoSendStream::Config& config);
+                  const VideoSendStream::Config& config,
+                  int base_channel);
 
   virtual ~VideoSendStream();
 
@@ -85,4 +86,4 @@
 }  // namespace internal
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_INTERNAL_VIDEO_SEND_STREAM_H_
+#endif  // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_