diff options
| author | kjellander <kjellander@chromium.org> | 2016-02-11 23:08:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-12 07:09:16 +0000 |
| commit | a86a77e255f43ffaf6c0e9679e76288ff98daf64 (patch) | |
| tree | 4ca4df1402c7da4f4db58b2bdfff0c88aa98f49e /remoting/protocol | |
| parent | 51ff2c8d2eb5d0da2d360888f5f286f6ab5e73c7 (diff) | |
| download | chromium_src-a86a77e255f43ffaf6c0e9679e76288ff98daf64.zip chromium_src-a86a77e255f43ffaf6c0e9679e76288ff98daf64.tar.gz chromium_src-a86a77e255f43ffaf6c0e9679e76288ff98daf64.tar.bz2 | |
Roll WebRTC 11579:11592, Libjingle 11568:11592
Update libjingle GYP+GN files for:
* talk/session/media -> webrtc/pc move.
* webrtc/media/webrtc -> webrtc/media/engine rename.
WebRTC 11579:11592
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/4ba95f2..4056bb6
Libjingle 11568:11592
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/a60ab43..761433d
BUG=webrtc:5419,webrtc:5420
TBR=tommi@chromium.org, sergeyu@chromium.org
Review URL: https://codereview.chromium.org/1690203002
Cr-Commit-Position: refs/heads/master@{#375141}
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/webrtc_video_capturer_adapter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/protocol/webrtc_video_capturer_adapter.cc b/remoting/protocol/webrtc_video_capturer_adapter.cc index 185f802..96c2c3a 100644 --- a/remoting/protocol/webrtc_video_capturer_adapter.cc +++ b/remoting/protocol/webrtc_video_capturer_adapter.cc @@ -7,7 +7,7 @@ #include <utility> #include "third_party/libyuv/include/libyuv/convert.h" -#include "third_party/webrtc/media/webrtc/webrtcvideoframe.h" +#include "third_party/webrtc/media/engine/webrtcvideoframe.h" #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" namespace remoting { |