Commit fe7d4f55 authored by Benjamin Otte's avatar Benjamin Otte

use GDK_PIXBUF_CONFDIR

Original commit message from CVS:
use GDK_PIXBUF_CONFDIR
parent 1ec681f8
......@@ -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 ================================
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment