Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / media / webrtc / webrtcmediaengine.h

diff --git a/src/third_party/libjingle/source/talk/media/webrtc/webrtcmediaengine.h b/src/third_party/libjingle/source/talk/media/webrtc/webrtcmediaengine.h
index df517ee..b4436cd 100644 (file)
--- a/src/third_party/libjingle/source/talk/media/webrtc/webrtcmediaengine.h
+++ b/src/third_party/libjingle/source/talk/media/webrtc/webrtcmediaengine.h
@@ -110,8 +110,9 @@ class DelegatingWebRtcMediaEngine : public cricket::MediaEngineInterface {
     return delegate_->CreateChannel();
   }
   virtual VideoMediaChannel* CreateVideoChannel(
+      const VideoOptions& options,
       VoiceMediaChannel* voice_media_channel) OVERRIDE {
-    return delegate_->CreateVideoChannel(voice_media_channel);
+    return delegate_->CreateVideoChannel(options, voice_media_channel);
   }
   virtual SoundclipMedia* CreateSoundclip() OVERRIDE {
     return delegate_->CreateSoundclip();
@@ -129,9 +130,6 @@ class DelegatingWebRtcMediaEngine : public cricket::MediaEngineInterface {
       const VideoEncoderConfig& config) OVERRIDE {
     return delegate_->SetDefaultVideoEncoderConfig(config);
   }
-  virtual VideoEncoderConfig GetDefaultVideoEncoderConfig() const OVERRIDE {
-    return delegate_->GetDefaultVideoEncoderConfig();
-  }
   virtual bool SetSoundDevices(
       const Device* in_device, const Device* out_device) OVERRIDE {
     return delegate_->SetSoundDevices(in_device, out_device);