Bug 1273965 part 3: Collapse & de-indent another else-after-return in MediaPipelineFactory.cpp, and drop a now-clearly-unnecessary NS_NOTREACHED. r?bwc
MozReview-Commit-ID: 6K4ng30gGPC
--- a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
@@ -1004,19 +1004,16 @@ MediaPipelineFactory::EnsureExternalCode
OMXVideoCodec::CreateDecoder(OMXVideoCodec::CodecType::CODEC_H264);
#else
decoder = GmpVideoCodec::CreateDecoder();
#endif
if (decoder) {
return aConduit.SetExternalRecvCodec(aConfig, decoder);
}
return kMediaConduitInvalidReceiveCodec;
- } else {
- MOZ_MTLOG(ML_ERROR,
- "Invalid video codec configured: " << aConfig->mName.c_str());
- return aIsSend ? kMediaConduitInvalidSendCodec
- : kMediaConduitInvalidReceiveCodec;
}
-
- NS_NOTREACHED("Shouldn't get here!");
+ MOZ_MTLOG(ML_ERROR,
+ "Invalid video codec configured: " << aConfig->mName.c_str());
+ return aIsSend ? kMediaConduitInvalidSendCodec
+ : kMediaConduitInvalidReceiveCodec;
}
} // namespace mozilla