(Auto)update libjingle 77689511-> 77696841
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7449 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h
index 8c73cfc..87bc8a3 100644
--- a/talk/media/base/fakemediaengine.h
+++ b/talk/media/base/fakemediaengine.h
@@ -477,6 +477,7 @@
sent_intra_frame_(false),
requested_intra_frame_(false),
max_bps_(-1) {}
+
~FakeVideoMediaChannel();
const std::vector<VideoCodec>& recv_codecs() const { return recv_codecs_; }
@@ -885,12 +886,14 @@
return default_encoder_config_;
}
- VideoMediaChannel* CreateChannel(VoiceMediaChannel* channel) {
+ VideoMediaChannel* CreateChannel(const VideoOptions& options,
+ VoiceMediaChannel* channel) {
if (fail_create_channel_) {
return NULL;
}
FakeVideoMediaChannel* ch = new FakeVideoMediaChannel(this);
+ ch->SetOptions(options);
channels_.push_back(ch);
return ch;
}