[farsight2/master] Make sure old codecs override local preferences

[Olivier Crête]

---
 gst/fsrtpconference/fs-rtp-codec-negotiation.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.c b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
index e7c2b59..380c64a 100644
--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.c
+++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
@@ -626,7 +626,8 @@ negotiate_stream_codecs (
 
         if (nego_codec)
         {
-          nego_codec->id = old_ca->codec->id;
+          if (use_local_ids)
+            nego_codec->id = old_ca->codec->id;
           break;
         }
       }
-- 
1.5.6.5