← Back to branch summary

~ubuntu-branches/ubuntu/feisty/gst-plugins-good0.10/feisty-security

« back to all changes in this revision

Viewing changes to ext/gdk_pixbuf/pixbufscale.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-12-21 21:12:15 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20061221211215-3uukkusokhe0nk4f
Tags: 0.10.5-0ubuntu1
* Sync with pkg-gstreamer SVN:
  + debian/rules:
    - Use Ubuntu as distribution name and point to the proper Launchpad URL
  + debian/patches/01_esdsink-priority.patch:
    - Mark the esdsink with rank primary-2 to get
      pulse > alsadmix > esd > alsa > oss

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/gdk_pixbuf/pixbufscale.c
253
253
    gst_structure_remove_field (structure, "pixel-aspect-ratio");
254
254
  }
255
255
 
256
 
  GST_DEBUG_OBJECT (trans, "returning caps: %", ret);
 
256
  GST_DEBUG_OBJECT (trans, "returning caps: %" GST_PTR_FORMAT, ret);
257
257
  return ret;
258
258
}
259
259
 
306
306
  GstPixbufScale *pixbufscale;
307
307
  gint width, height;
308
308
 
309
 
  g_return_val_if_fail (size, FALSE);
 
309
  g_assert (size);
310
310
 
311
311
  pixbufscale = GST_PIXBUFSCALE (trans);
312
312