From 7470eb7977c153d2a512f8376601b15c6266fa25 Mon Sep 17 00:00:00 2001 From: perkj Date: Wed, 13 Jul 2016 03:03:04 -0700 Subject: [PATCH] Revert of Clean up unused cricket::VideoCapturer inclusion from mediaengine.h (patchset #1 id:1 of https://codereview.webrtc.org/2149533002/ ) Reason for revert: Still broken- but different place. Original issue's description: > Reland of Clean up unused cricket::VideoCapturer inclusion from mediaengine.h (patchset #1 id:1 of https://codereview.webrtc.org/2142893002/ ) > > Reason for revert: > Upstream fixed. > > Original issue's description: > > Revert of Clean up unused cricket::VideoCapturer inclusion from mediaengine.h (patchset #1 id:1 of https://codereview.webrtc.org/2147443002/ ) > > > > Reason for revert: > > Breaks up stream projects. > > > > Original issue's description: > > > Clean up unused cricket::VideoCapturer inclusion from mediaengine.h > > > > > > TBR=nisse@webrtc.org > > > BUG=webrtc:5426 > > > > > > Committed: https://crrev.com/1e56991f248f8235c69cb3d95b35a44389c48354 > > > Cr-Commit-Position: refs/heads/master@{#13446} > > > > TBR=nisse@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:5426 > > > > Committed: https://crrev.com/3a9f41e584953226e43bf312ec59d625c97cfd62 > > Cr-Commit-Position: refs/heads/master@{#13447} > > TBR=nisse@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:5426 > > Committed: https://crrev.com/e03c1618152824a980664536a64bc29d63740ad7 > Cr-Commit-Position: refs/heads/master@{#13456} TBR=nisse@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5426 Review-Url: https://codereview.webrtc.org/2143123003 Cr-Commit-Position: refs/heads/master@{#13458} --- webrtc/media/base/mediaengine.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webrtc/media/base/mediaengine.h b/webrtc/media/base/mediaengine.h index 4fbb71b17c..dd1f5272a0 100644 --- a/webrtc/media/base/mediaengine.h +++ b/webrtc/media/base/mediaengine.h @@ -25,6 +25,7 @@ #include "webrtc/media/base/codec.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/mediacommon.h" +#include "webrtc/media/base/videocapturer.h" #include "webrtc/media/base/videocommon.h" #include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h" @@ -39,6 +40,8 @@ class Call; namespace cricket { +class VideoCapturer; + struct RtpCapabilities { std::vector header_extensions; };