diff options
| author | David Schleef <ds@schleef.org> | 2004-02-11 08:31:35 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-02-11 08:31:35 +0000 |
| commit | f30ceaa6451a3a3ee54bc9660903227f5cd30b90 (patch) | |
| tree | 53a2fe9642253918edc62c14f67a5a8a54449744 /ext/gdk_pixbuf/gstgdkpixbuf.c | |
| parent | b1c2fb3ab77467e856b1fb514513958d8ac83ede (diff) | |
ext/gdk_pixbuf/gstgdkpixbuf.c: Fix logic bug causing spurious errors.
Original commit message from CVS:
* ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_sink_link),
(gst_gdk_pixbuf_chain): Fix logic bug causing spurious errors.
* ext/jpeg/gstjpegdec.c: (gst_jpegdec_base_init),
(gst_jpegdec_init), (gst_jpegdec_chain): Fix negotiation.
* ext/jpeg/gstjpegenc.c: (gst_jpegenc_base_init),
(gst_jpegenc_class_init), (gst_jpegenc_init),
(gst_jpegenc_getcaps), (gst_jpegenc_link), (gst_jpegenc_resync),
(gst_jpegenc_chain), (gst_jpegenc_set_property),
(gst_jpegenc_get_property): Fix negotiation. Add some properties.
* ext/jpeg/gstjpegenc.h: Fix negotiation.
Diffstat (limited to 'ext/gdk_pixbuf/gstgdkpixbuf.c')
| -rw-r--r-- | ext/gdk_pixbuf/gstgdkpixbuf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c index 864b54f3..c3c9e5f1 100644 --- a/ext/gdk_pixbuf/gstgdkpixbuf.c +++ b/ext/gdk_pixbuf/gstgdkpixbuf.c @@ -109,7 +109,7 @@ gst_gdk_pixbuf_sink_link (GstPad *pad, const GstCaps *caps) g_return_val_if_fail (GST_IS_GDK_PIXBUF (filter), GST_PAD_LINK_REFUSED); - filter->framerate = 0.0; + filter->framerate = 1.0; gst_structure_get_double (gst_caps_get_structure (caps, 0), "framerate", &filter->framerate); @@ -285,9 +285,9 @@ gst_gdk_pixbuf_chain (GstPad *pad, GstData *_data) if (filter->pixbuf_loader != NULL) { GstBuffer *outbuf; GdkPixbuf *pixbuf; - GError *error; + GError *error = NULL; - if (gdk_pixbuf_loader_close (filter->pixbuf_loader, &error)) { + if (!gdk_pixbuf_loader_close (filter->pixbuf_loader, &error)) { GST_ELEMENT_ERROR (filter, LIBRARY, SHUTDOWN, (NULL), (error->message)); g_error_free (error); return; |