← 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/videobox/gstvideobox.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/videobox/gstvideobox.c
66
66
 
67
67
#include <gst/controller/gstcontroller.h>
68
68
 
 
69
#include "gst/glib-compat-private.h"
 
70
 
69
71
GST_DEBUG_CATEGORY_STATIC (videobox_debug);
70
72
#define GST_CAT_DEFAULT videobox_debug
71
73
 
3272
3274
gst_video_box_process (GstVideoBox * video_box, const guint8 * src,
3273
3275
    guint8 * dest)
3274
3276
{
3275
 
  guint b_alpha = CLAMP (video_box->border_alpha * 256, 0, 256);
3276
 
  guint i_alpha = CLAMP (video_box->alpha * 256, 0, 256);
 
3277
  guint b_alpha = CLAMP (video_box->border_alpha * 256, 0, 255);
 
3278
  guint i_alpha = CLAMP (video_box->alpha * 256, 0, 255);
3277
3279
  GstVideoBoxFill fill_type = video_box->fill_type;
3278
3280
  gint br, bl, bt, bb, crop_w, crop_h;
3279
3281