Backed out changeset 53d8b186e574 (bug 786234)
authorAdam Roach [:abr] <adam@nostrum.com>
Mon, 24 Feb 2014 12:29:10 -0600
changeset 170568 1582d179f029d18ed62bc9d9dde08dfe9396d8eb
parent 170567 2b0258a49e8d5036c031fae3f3dfc144a0673fb4
child 170569 098be567e0d4a81bdf34c89076052a75a6084c80
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
bugs786234
milestone30.0a1
backs out53d8b186e5742151279233834e73eb0eef02a6c9
Backed out changeset 53d8b186e574 (bug 786234)
media/webrtc/moz.build
media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp
--- a/media/webrtc/moz.build
+++ b/media/webrtc/moz.build
@@ -59,17 +59,16 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
         'signaling/src/callcontrol/CallControlManagerImpl.cpp',
         'signaling/src/common/browser_logging/CSFLog.cpp',
         'signaling/src/media-conduit/AudioConduit.cpp',
         'signaling/src/media-conduit/VideoConduit.cpp',
         'signaling/src/media/CSFAudioControlWrapper.cpp',
         'signaling/src/media/CSFVideoControlWrapper.cpp',
         'signaling/src/media/VcmSIPCCBinding.cpp',
         'signaling/src/mediapipeline/MediaPipeline.cpp',
-        'signaling/src/mediapipeline/MediaPipelineFilter.cpp',
         'signaling/src/mediapipeline/SrtpFlow.cpp',
         'signaling/src/peerconnection/MediaStreamList.cpp',
         'signaling/src/peerconnection/PeerConnectionCtx.cpp',
         'signaling/src/peerconnection/PeerConnectionImpl.cpp',
         'signaling/src/peerconnection/PeerConnectionMedia.cpp',
         'signaling/src/sipcc/core/ccapp/call_logger.c',
         'signaling/src/sipcc/core/ccapp/capability_set.c',
         'signaling/src/sipcc/core/ccapp/cc_call_feature.c',
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp
@@ -2,19 +2,19 @@
 /* vim: softtabstop=2:shiftwidth=2:expandtab
  * */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Original author: bcampen@mozilla.com
 
-#include "logging.h"
+#include "MediaPipelineFilter.h"
 
-#include "MediaPipelineFilter.h"
+#include "logging.h"
 
 #include "webrtc/modules/interface/module_common_types.h"
 
 // Logging context
 MOZ_MTLOG_MODULE("mediapipeline")
 
 namespace mozilla {