diff options
| author | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-13 17:26:08 +0000 |
|---|---|---|
| committer | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-13 17:26:08 +0000 |
| commit | a09a99950ec40aef6421e4ba35eee7196b7a6e68 (patch) | |
| tree | 8831fcbdfb81a82a6a724c57fe1ec206c7cf0e05 /talk/app/webrtc/mediastreamsignaling.cc | |
| parent | b242c44354348ff3b8deb37e877114348a7c2ae4 (diff) | |
| download | webrtc-a09a99950ec40aef6421e4ba35eee7196b7a6e68.tar.gz | |
(Auto)update libjingle 73222930-> 73226398
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6891 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/app/webrtc/mediastreamsignaling.cc')
| -rw-r--r-- | talk/app/webrtc/mediastreamsignaling.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/talk/app/webrtc/mediastreamsignaling.cc b/talk/app/webrtc/mediastreamsignaling.cc index 7cdd5ed1cc..c4a8281da7 100644 --- a/talk/app/webrtc/mediastreamsignaling.cc +++ b/talk/app/webrtc/mediastreamsignaling.cc @@ -30,17 +30,17 @@ #include <vector> #include "talk/app/webrtc/audiotrack.h" -#include "talk/app/webrtc/mediastreamproxy.h" #include "talk/app/webrtc/mediaconstraintsinterface.h" +#include "talk/app/webrtc/mediastreamproxy.h" #include "talk/app/webrtc/mediastreamtrackproxy.h" #include "talk/app/webrtc/remoteaudiosource.h" #include "talk/app/webrtc/remotevideocapturer.h" #include "talk/app/webrtc/sctputils.h" #include "talk/app/webrtc/videosource.h" #include "talk/app/webrtc/videotrack.h" +#include "talk/media/sctp/sctpdataengine.h" #include "webrtc/base/bytebuffer.h" #include "webrtc/base/stringutils.h" -#include "talk/media/sctp/sctpdataengine.h" static const char kDefaultStreamLabel[] = "default"; static const char kDefaultAudioTrackLabel[] = "defaulta0"; |