Bug 1303411: Add parens to some logic in VideoConduit.cpp, to address clang -Wlogical-op-parentheses build warning. r=dminor
authorDaniel Holbert <dholbert@cs.stanford.edu>
Fri, 16 Sep 2016 11:23:58 -0700
changeset 355550 94cb2bf70c74358ac1645eb15bee59381dd3d73a
parent 355549 a76f19132914a2e8d17aa909162139d3a5916b05
child 355551 0b5473d5b966f87cc8020d42343e8e1ce3a81ac5
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdminor
bugs1303411
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1303411: Add parens to some logic in VideoConduit.cpp, to address clang -Wlogical-op-parentheses build warning. r=dminor MozReview-Commit-ID: BMq48HVLUH7
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -739,17 +739,17 @@ WebrtcVideoConduit::ConfigureSendMediaCo
   mVideoCodecStat->Register(true);
 
   mSendingWidth = 0;
   mSendingHeight = 0;
   mSendingFramerate = video_codec.maxFramerate;
 
   // See Bug 1297058, enabling FEC when NACK is set on H.264 is problematic
   bool use_fec = codecConfig->RtcpFbFECIsSet();
-  if (mExternalSendCodec && codecConfig->mType == mExternalSendCodec->mType
+  if ((mExternalSendCodec && codecConfig->mType == mExternalSendCodec->mType)
       || codecConfig->mType == webrtc::kVideoCodecH264) {
     if(codecConfig->RtcpFbNackIsSet("")) {
       use_fec = false;
     }
   }
 
   if (use_fec)
   {