← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ext/gdk_pixbuf/gstgdkpixbufsink.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:
ext/gdk_pixbuf/gstgdkpixbufsink.c
271
271
 
272
272
  GST_INFO_OBJECT (sink, "format             : %d", fmt);
273
273
  GST_INFO_OBJECT (sink, "width x height     : %d x %d", w, h);
274
 
  GST_INFO_OBJECT (sink, "pixel-aspect-ratio : %d/%d", par_d, par_n);
 
274
  GST_INFO_OBJECT (sink, "pixel-aspect-ratio : %d/%d", par_n, par_d);
275
275
 
276
276
  return TRUE;
277
277
}
344
344
     * The structure will take its own ref to the pixbuf. */
345
345
    s = gst_structure_new (msg_name,
346
346
        "pixbuf", GDK_TYPE_PIXBUF, pixbuf,
347
 
        "pixel-aspect-ratio", GST_TYPE_FRACTION, sink->par_d, sink->par_n,
 
347
        "pixel-aspect-ratio", GST_TYPE_FRACTION, sink->par_n, sink->par_d,
348
348
        NULL);
349
349
 
350
350
    msg = gst_message_new_element (GST_OBJECT_CAST (sink), s);