From 1886226bac8b798abb3c56d74231def609bd6438 Mon Sep 17 00:00:00 2001
From: "Nils Ohlmeier [:drno]" <drno@ohlmeier.org>
Date: Mon, 30 Mar 2015 20:48:28 -0700
Subject: [PATCH] Bug 1148572 - Improve H264 renegotiation handling. r=jesup,
 a=sledru

---
 .../signaling/src/peerconnection/MediaPipelineFactory.cpp      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
index 4a2bf2206dbb..2f9cc3620767 100644
--- a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
@@ -785,6 +785,9 @@ MediaPipelineFactory::EnsureExternalCodec(VideoSessionConduit& aConduit,
   if (aConfig->mName == "VP8") {
     return kMediaConduitNoError;
   } else if (aConfig->mName == "H264") {
+    if (aConduit.CodecPluginID() != 0) {
+      return kMediaConduitNoError;
+    }
     // Register H.264 codec.
     if (aIsSend) {
       VideoEncoder* encoder = nullptr;