diff options
| author | kjellander <kjellander@chromium.org> | 2016-02-05 04:26:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-05 12:27:18 +0000 |
| commit | a4becae24a1347569a22dd5b5f5012ba1b39bcd1 (patch) | |
| tree | ec01c350cd3a3baf36dea98878c5d73dcc48b761 /remoting/protocol | |
| parent | 7c5cef674f5b03cedb1fbdf8518ebc80de08202e (diff) | |
| download | chromium_src-a4becae24a1347569a22dd5b5f5012ba1b39bcd1.zip chromium_src-a4becae24a1347569a22dd5b5f5012ba1b39bcd1.tar.gz chromium_src-a4becae24a1347569a22dd5b5f5012ba1b39bcd1.tar.bz2 | |
Roll WebRTC 11486:11495, Libjingle 11485:11495
Includes changes for moving talk/media to webrtc/media which took
place in https://codereview.webrtc.org/1587193006/
WebRTC 11486:11495
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/052f590..e1bbb30
Libjingle 11485:11495
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/d70be77..abc975d
TBR=perkj@chromium.org,sergeyu@chromium.org
BUG=webrtc:5420
Review URL: https://codereview.chromium.org/1669023004
Cr-Commit-Position: refs/heads/master@{#373795}
Diffstat (limited to 'remoting/protocol')
4 files changed, 4 insertions, 4 deletions
diff --git a/remoting/protocol/chromium_socket_factory.cc b/remoting/protocol/chromium_socket_factory.cc index 773657d..82a8eb4 100644 --- a/remoting/protocol/chromium_socket_factory.cc +++ b/remoting/protocol/chromium_socket_factory.cc @@ -17,9 +17,9 @@ #include "net/base/net_errors.h" #include "net/udp/udp_server_socket.h" #include "remoting/protocol/socket_util.h" -#include "third_party/libjingle/source/talk/media/base/rtputils.h" #include "third_party/webrtc/base/asyncpacketsocket.h" #include "third_party/webrtc/base/nethelpers.h" +#include "third_party/webrtc/media/base/rtputils.h" namespace remoting { namespace protocol { diff --git a/remoting/protocol/webrtc_video_capturer_adapter.cc b/remoting/protocol/webrtc_video_capturer_adapter.cc index 12cfbf3..185f802 100644 --- a/remoting/protocol/webrtc_video_capturer_adapter.cc +++ b/remoting/protocol/webrtc_video_capturer_adapter.cc @@ -6,8 +6,8 @@ #include <utility> -#include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoframe.h" #include "third_party/libyuv/include/libyuv/convert.h" +#include "third_party/webrtc/media/webrtc/webrtcvideoframe.h" #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" namespace remoting { diff --git a/remoting/protocol/webrtc_video_capturer_adapter.h b/remoting/protocol/webrtc_video_capturer_adapter.h index b9f487c..add16036 100644 --- a/remoting/protocol/webrtc_video_capturer_adapter.h +++ b/remoting/protocol/webrtc_video_capturer_adapter.h @@ -15,7 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "base/timer/timer.h" -#include "third_party/libjingle/source/talk/media/base/videocapturer.h" +#include "third_party/webrtc/media/base/videocapturer.h" #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" namespace base { diff --git a/remoting/protocol/webrtc_video_renderer_adapter.cc b/remoting/protocol/webrtc_video_renderer_adapter.cc index 757074e..ec38ed5 100644 --- a/remoting/protocol/webrtc_video_renderer_adapter.cc +++ b/remoting/protocol/webrtc_video_renderer_adapter.cc @@ -13,8 +13,8 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "remoting/protocol/frame_consumer.h" -#include "third_party/libjingle/source/talk/media/base/videoframe.h" #include "third_party/libyuv/include/libyuv/video_common.h" +#include "third_party/webrtc/media/base/videoframe.h" #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" namespace remoting { |