← 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/camerabin2/gstplugin.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/camerabin2/gstplugin.c
24
24
#endif
25
25
 
26
26
#include "gstviewfinderbin.h"
27
 
#include "gstimagecapturebin.h"
28
27
#include "gstwrappercamerabinsrc.h"
29
28
#include "gstcamerabin2.h"
30
29
 
33
32
{
34
33
  if (!gst_viewfinder_bin_plugin_init (plugin))
35
34
    return FALSE;
36
 
  if (!gst_image_capture_bin_plugin_init (plugin))
37
 
    return FALSE;
38
35
  if (!gst_wrapper_camera_bin_src_plugin_init (plugin))
39
36
    return FALSE;
40
 
  if (!gst_camera_bin_plugin_init (plugin))
 
37
  if (!gst_camera_bin2_plugin_init (plugin))
41
38
    return FALSE;
42
39
 
43
40
  return TRUE;