← 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/camerabin/gstinputselector.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/camerabin/gstinputselector.c
745
745
      "Julien Moutte <julien@moutte.net>, "
746
746
      "Jan Schmidt <thaytan@mad.scientist.com>, "
747
747
      "Wim Taymans <wim.taymans@gmail.com>");
748
 
  gst_element_class_add_pad_template (element_class,
749
 
      gst_static_pad_template_get (&gst_input_selector_sink_factory));
750
 
  gst_element_class_add_pad_template (element_class,
751
 
      gst_static_pad_template_get (&gst_input_selector_src_factory));
 
748
  gst_element_class_add_static_pad_template (element_class,
 
749
      &gst_input_selector_sink_factory);
 
750
  gst_element_class_add_static_pad_template (element_class,
 
751
      &gst_input_selector_src_factory);
752
752
}
753
753
 
754
754
static void