farstream-0.1/trunk/intersect-instead-of-merge.patch

   1 diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
   2 index d128e84..3521580 100644
   3 --- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
   4 +++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
   5 @@ -1110,11 +1110,8 @@ compare_media_caps (gconstpointer a, gconstpointer b)
   6  }
   7
   8  static gint
   9 -compare_rtp_caps (gconstpointer a, gconstpointer b)
  10 +compare_rtp_caps (CodecCap *element, GstCaps *c_caps)
  11  {
  12 -  CodecCap *element = (CodecCap *)a;
  13 -  GstCaps *c_caps = (GstCaps *)b;
  14 -
  15    return !gst_caps_can_intersect (element->rtp_caps, c_caps);
  16  }
  17
  18 @@ -1226,7 +1223,7 @@ create_codec_cap_list (GstElementFactory *factory,
  19          if (rtp_caps) {
  20            if (entry->rtp_caps) {
  21              GstCaps *new_rtp_caps;
  22 -            new_rtp_caps = gst_caps_union (rtp_caps, entry->rtp_caps);
  23 +            new_rtp_caps = gst_caps_intersect (rtp_caps, entry->rtp_caps);
  24              gst_caps_unref (entry->rtp_caps);
  25              entry->rtp_caps = new_rtp_caps;
  26            } else {