diff options
| author | Benjamin Otte <otte@gnome.org> | 2003-11-24 23:16:04 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2003-11-24 23:16:04 +0000 |
| commit | fe7d4f55676ce70510ca3b9ff30c2239c5762b39 (patch) | |
| tree | c44397a21b5c2902dca34af3996ef07f0b896ed0 | |
| parent | 1ec681f8ac7bc97abb48ef025f03cd63982cb5a3 (diff) | |
| download | gstreamer-plugins-bad-fe7d4f55676ce70510ca3b9ff30c2239c5762b39.tar.gz | |
use GDK_PIXBUF_CONFDIR
Original commit message from CVS:
use GDK_PIXBUF_CONFDIR
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | ext/hermes/gstcolorspace.c | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 6889940a4..59d936b52 100644 --- a/configure.ac +++ b/configure.ac @@ -266,15 +266,15 @@ AC_ARG_WITH(gdk-pixbuf-loader-dir, ]) AC_SUBST(GDK_PIXBUF_LOADER_DIR) -GDK_PIXBUF_CONFFILE="$GDK_PIXBUF_PREFIXDIR/gtk-2.0/gdk-pixbuf.loaders" +GDK_PIXBUF_CONFDIR="$GDK_PIXBUF_PREFIXDIR/etc/gtk-2.0/" AC_ARG_WITH(gdk-pixbuf-conffile, - AC_HELP_STRING([--with-gdk-pixbuf-conffile], - [path to the gdk_pixbuf config file]), + AC_HELP_STRING([--with-gdk-pixbuf-confdir], + [path to the gdk_pixbuf config directroy]), [if test "x${withval}" != x ; then - GDK_PIXBUF_CONFFILE="${withval}" + GDK_PIXBUF_CONFDIR="${withval}" fi ]) -AC_SUBST(GDK_PIXBUF_CONFFILE) +AC_SUBST(GDK_PIXBUF_CONFDIR) dnl =========================================================================== dnl ============================= gst plug-ins ================================ diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c index de1bd88f7..ac63fe4d2 100644 --- a/ext/hermes/gstcolorspace.c +++ b/ext/hermes/gstcolorspace.c @@ -131,6 +131,9 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t gst_caps_get_int (from_caps, "red_mask", &space->source.r); gst_caps_get_int (from_caps, "green_mask", &space->source.g); gst_caps_get_int (from_caps, "blue_mask", &space->source.b); + space->source.r = GINT_TO_BE (space->source.r); + space->source.g = GINT_TO_BE (space->source.g); + space->source.b = GINT_TO_BE (space->source.b); space->source.a = 0; space->srcbpp = space->source.bits = from_bpp; space->source.indexed = 0; @@ -144,6 +147,9 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t gst_caps_get_int (to_caps, "red_mask", &space->dest.r); gst_caps_get_int (to_caps, "green_mask", &space->dest.g); gst_caps_get_int (to_caps, "blue_mask", &space->dest.b); + space->dest.r = 0x0000FF; //GINT_TO_BE (space->dest.r); + space->dest.g = 0x00FF00; //GINT_TO_BE (space->dest.g); + space->dest.b = 0xFF0000; //GINT_TO_BE (space->dest.b); space->dest.a = 0; space->destbpp = space->dest.bits = to_bpp; space->dest.indexed = 0; |