generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 73222930-> 73226398

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6891 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-08-13 17:26:08 +00:00
parent b242c44354
commit a09a99950e
368 changed files with 861 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
talk/examples/peerconnection/client/conductor.cc
View File

@@ -30,11 +30,11 @@
#include <utility>
#include "talk/app/webrtc/videosourceinterface.h"
#include "talk/examples/peerconnection/client/defaults.h"
#include "talk/media/devices/devicemanager.h"
#include "webrtc/base/common.h"
#include "webrtc/base/json.h"
#include "webrtc/base/logging.h"
#include "talk/examples/peerconnection/client/defaults.h"
#include "talk/media/devices/devicemanager.h"
// Names used for a IceCandidate JSON object.
const char kCandidateSdpMidName[] = "sdpMid";

4
talk/examples/peerconnection/client/conductor.h
View File

@@ -34,10 +34,10 @@
#include <set>
#include <string>
#include "talk/examples/peerconnection/client/main_wnd.h"
#include "talk/examples/peerconnection/client/peer_connection_client.h"
#include "talk/app/webrtc/mediastreaminterface.h"
#include "talk/app/webrtc/peerconnectioninterface.h"
#include "talk/examples/peerconnection/client/main_wnd.h"
#include "talk/examples/peerconnection/client/peer_connection_client.h"
#include "webrtc/base/scoped_ptr.h"
namespace webrtc {

2
talk/examples/peerconnection/client/main_wnd.cc
View File

@@ -29,9 +29,9 @@
#include <math.h>
#include "talk/examples/peerconnection/client/defaults.h"
#include "webrtc/base/common.h"
#include "webrtc/base/logging.h"
#include "talk/examples/peerconnection/client/defaults.h"
ATOM MainWnd::wnd_class_ = 0;
const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd";

2
talk/examples/peerconnection/client/main_wnd.h
View File

@@ -33,12 +33,12 @@
#include <string>
#include "talk/app/webrtc/mediastreaminterface.h"
#include "webrtc/base/win32.h"
#include "talk/examples/peerconnection/client/peer_connection_client.h"
#include "talk/media/base/mediachannel.h"
#include "talk/media/base/videocommon.h"
#include "talk/media/base/videoframe.h"
#include "talk/media/base/videorenderer.h"
#include "webrtc/base/win32.h"
class MainWndCallback {
public:

2
talk/examples/peerconnection/client/peer_connection_client.cc
View File

@@ -29,8 +29,8 @@
#include "talk/examples/peerconnection/client/defaults.h"
#include "webrtc/base/common.h"
#include "webrtc/base/nethelpers.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/nethelpers.h"
#include "webrtc/base/stringutils.h"
#ifdef WIN32

4
talk/examples/peerconnection/client/peer_connection_client.h
View File

@@ -33,10 +33,10 @@
#include <string>
#include "webrtc/base/nethelpers.h"
#include "webrtc/base/signalthread.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/physicalsocketserver.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/signalthread.h"
#include "webrtc/base/sigslot.h"
typedef std::map<int, std::string> Peers;

2
talk/examples/peerconnection/server/main.cc
View File

@@ -31,10 +31,10 @@
#include <vector>
#include "webrtc/base/flags.h"
#include "talk/examples/peerconnection/server/data_socket.h"
#include "talk/examples/peerconnection/server/peer_channel.h"
#include "talk/examples/peerconnection/server/utils.h"
#include "webrtc/base/flags.h"
DEFINE_bool(help, false, "Prints this message");
DEFINE_int(port, 8888, "The port on which to listen.");