commit 99c2fe5d2b3f0dcc9d8c723b99ddd73648e73b82
author Noah Richards <noahric@chromium.org> Fri Apr 10 14:32:39 2015 -0700
committer Noah Richards <noahric@chromium.org> Fri Apr 10 21:32:42 2015 +0000
tree 68a1af4bd012b34bf99e8628463f0493423fb75e
parent b32a5c48d3d0b17f564fe680c7e1e45d5b76eefd

Fix NullVideoEngine's CreateChannel implementation.

BUG=
R=pthatcher@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8980}

talk/media/base/mediaengine.h

diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h
index 61424d2..8186ad1 100644
--- a/talk/media/base/mediaengine.h
+++ b/talk/media/base/mediaengine.h
@@ -336,6 +336,7 @@
   int GetCapabilities() { return 0; }
   // If you need this to return an actual channel, use FakeMediaEngine instead.
   VideoMediaChannel* CreateChannel(
+      const VideoOptions& options,
       VoiceMediaChannel* voice_media_channel) {
     return NULL;
   }