← Back to branch summary

~ubuntu-branches/ubuntu/raring/gst-plugins-good0.10/raring-proposed

« back to all changes in this revision

Viewing changes to gst/rtpmanager/gstrtpbin.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-02-09 16:44:53 UTC
  • mfrom: (40.2.38 experimental)
  • Revision ID: package-import@ubuntu.com-20120209164453-6hjokwrvdn42zopb
Tags: 0.10.30.3-1ubuntu1
* Merge from Debian experimental, remaining changes:
  - 04_move_farsight_plugins_to_good.patch
    Import autoconvert, dtmf, liveadder, rptmux from -plugins-bad
  - 05_move_shm_to_good.patch
    Import shm from -plugins-bad.
  - 07_move-camerabin.patch
    Import camerabin, camerabin2, jpegformat and basecamerabinsrc
    from -plugins-bad.
  - control*:
    * Drop dependency from gstreamer0.10-plugins-good on
      gstreamer0.10-gconf. It pulls gconf and gtk3 onto the Kubuntu cd.
    * Use Breaks instead of Conflicts.
    * Add a 'Pre-Depends: ${misc:Pre-Depends}' to the plugin package,
      since we're shipping shared libraries in the package that Debian
      isn't.
* Update the patches by pulling new version of the code from
  -plugins-bad 0.10.22.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst/rtpmanager/gstrtpbin.c
129
129
#include "gstrtpsession.h"
130
130
#include "gstrtpjitterbuffer.h"
131
131
 
 
132
#include <gst/glib-compat-private.h>
 
133
 
132
134
GST_DEBUG_CATEGORY_STATIC (gst_rtp_bin_debug);
133
135
#define GST_CAT_DEFAULT gst_rtp_bin_debug
134
136
 
1878
1880
static void
1879
1881
gst_rtp_bin_init (GstRtpBin * rtpbin, GstRtpBinClass * klass)
1880
1882
{
1881
 
  gchar *str;
 
1883
  gchar *cname;
1882
1884
 
1883
1885
  rtpbin->priv = GST_RTP_BIN_GET_PRIVATE (rtpbin);
1884
1886
  rtpbin->priv->bin_lock = g_mutex_new ();
1896
1898
  rtpbin->use_pipeline_clock = DEFAULT_USE_PIPELINE_CLOCK;
1897
1899
 
1898
1900
  /* some default SDES entries */
1899
 
  str = g_strdup_printf ("%s@%s", g_get_user_name (), g_get_host_name ());
 
1901
  cname = g_strdup_printf ("user%u@host-%x", g_random_int (), g_random_int ());
1900
1902
  rtpbin->sdes = gst_structure_new ("application/x-rtp-source-sdes",
1901
 
      "cname", G_TYPE_STRING, str,
1902
 
      "name", G_TYPE_STRING, g_get_real_name (),
1903
 
      "tool", G_TYPE_STRING, "GStreamer", NULL);
1904
 
  g_free (str);
 
1903
      "cname", G_TYPE_STRING, cname, "tool", G_TYPE_STRING, "GStreamer", NULL);
 
1904
  g_free (cname);
1905
1905
}
1906
1906
 
1907
1907
static void