diff options
author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-07-06 20:49:52 +0000 |
---|---|---|
committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-07-06 20:49:52 +0000 |
commit | 292fec2a0bd1f221a46ad69c5100995d04c01057 (patch) | |
tree | 658db299e0e03b2454ff840730569d79539e67c4 /ext/gdk_pixbuf | |
parent | a8183e9a3fa87cf4247c7df16207f440ea4069c0 (diff) |
New mimetypes gone into effect today - this commit changes all old mimetypes over to the new mimetypes spec as descri...
Original commit message from CVS:
New mimetypes gone into effect today - this commit changes all old mimetypes over to the new mimetypes spec as described in the previous commit's document. Note: some plugins will break, some pipelines will break, expect HEAD to be broken or at least not 100% working for a few days, but don't forget to report bugs
Diffstat (limited to 'ext/gdk_pixbuf')
-rw-r--r-- | ext/gdk_pixbuf/gstgdkpixbuf.c | 7 | ||||
-rw-r--r-- | ext/gdk_pixbuf/gstgdkpixbuf.h | 22 |
2 files changed, 25 insertions, 4 deletions
diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c index 667d5704..e9e12897 100644 --- a/ext/gdk_pixbuf/gstgdkpixbuf.c +++ b/ext/gdk_pixbuf/gstgdkpixbuf.c @@ -81,10 +81,12 @@ GST_PAD_TEMPLATE_FACTORY (gst_gdk_pixbuf_src_factory, GST_PAD_ALWAYS, GST_CAPS_NEW( "gdk_pixbuf_src", - "video/raw", - "format", GST_PROPS_FOURCC(GST_MAKE_FOURCC('R','G','B',' ')), + "video/x-raw-rgb", "width", GST_PROPS_INT_RANGE(1,INT_MAX), "height", GST_PROPS_INT_RANGE(1,INT_MAX), + /* well, it's needed for connectivity but this + * doesn't really make sense... */ + "framerate", GST_PROPS_FLOAT_RANGE(0, G_MAXFLOAT), "bpp", GST_PROPS_INT(32), "depth", GST_PROPS_INT(24), "endianness", GST_PROPS_INT(G_BIG_ENDIAN), @@ -268,6 +270,7 @@ gst_gdk_pixbuf_chain (GstPad *pad, GstBuffer *buf) caps = gst_pad_get_caps(filter->srcpad); gst_caps_set(caps, "width", GST_PROPS_INT(filter->width)); gst_caps_set(caps, "height", GST_PROPS_INT(filter->height)); + gst_caps_set(caps, "framerate", GST_PROPS_FLOAT(0.)); gst_pad_try_set_caps(filter->srcpad, caps); } diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.h b/ext/gdk_pixbuf/gstgdkpixbuf.h index 8c6486ca..6cfcdbc5 100644 --- a/ext/gdk_pixbuf/gstgdkpixbuf.h +++ b/ext/gdk_pixbuf/gstgdkpixbuf.h @@ -1,5 +1,23 @@ -/* - * gstplugin.h: sample header file for plug-in +/* + * gstgdkpixbuf.h + * GStreamer + * Copyright (C) 1999-2001 Erik Walthinsen <omega@cse.ogi.edu> + * Copyright (C) 2003 David A. Schleef <ds@schleef.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #ifndef __GST_GDK_PIXBUF_H__ |