--- a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
@@ -973,19 +973,21 @@ MediaPipelineFactory::EnsureExternalCode
                }
              }
            }
          }
        }
      }
 #endif
      return kMediaConduitNoError;
-  } else if (aConfig->mName == "VP9") {
+  }
+  if (aConfig->mName == "VP9") {
     return kMediaConduitNoError;
-  } else if (aConfig->mName == "H264") {
+  }
+  if (aConfig->mName == "H264") {
     if (aConduit.CodecPluginID() != 0) {
       return kMediaConduitNoError;
     }
     // Register H.264 codec.
     if (aIsSend) {
       VideoEncoder* encoder = nullptr;
 #ifdef MOZ_WEBRTC_OMX
       encoder =