admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Clean up unused cricket::VideoCapturer inclusion from mediaengine.h (patchset #1 id:1 of https://codereview.webrtc.org/2149533002/ )

Browse Source 
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}
This commit is contained in:
perkj 2016-07-13 03:03:04 -07:00 committed by Commit bot
parent 5dd941e5a5
commit 7470eb7977
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/media/base/mediaengine.h
View File

@ -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<webrtc::RtpExtension> header_extensions;
};