mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-23 14:36:24 +00:00
use GDK_PIXBUF_CONFDIR
Original commit message from CVS: use GDK_PIXBUF_CONFDIR
This commit is contained in:
parent
1ec681f8ac
commit
fe7d4f5567
2 changed files with 11 additions and 5 deletions
10
configure.ac
10
configure.ac
|
@ -266,15 +266,15 @@ AC_ARG_WITH(gdk-pixbuf-loader-dir,
|
||||||
])
|
])
|
||||||
AC_SUBST(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_ARG_WITH(gdk-pixbuf-conffile,
|
||||||
AC_HELP_STRING([--with-gdk-pixbuf-conffile],
|
AC_HELP_STRING([--with-gdk-pixbuf-confdir],
|
||||||
[path to the gdk_pixbuf config file]),
|
[path to the gdk_pixbuf config directroy]),
|
||||||
[if test "x${withval}" != x ; then
|
[if test "x${withval}" != x ; then
|
||||||
GDK_PIXBUF_CONFFILE="${withval}"
|
GDK_PIXBUF_CONFDIR="${withval}"
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
AC_SUBST(GDK_PIXBUF_CONFFILE)
|
AC_SUBST(GDK_PIXBUF_CONFDIR)
|
||||||
|
|
||||||
dnl ===========================================================================
|
dnl ===========================================================================
|
||||||
dnl ============================= gst plug-ins ================================
|
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, "red_mask", &space->source.r);
|
||||||
gst_caps_get_int (from_caps, "green_mask", &space->source.g);
|
gst_caps_get_int (from_caps, "green_mask", &space->source.g);
|
||||||
gst_caps_get_int (from_caps, "blue_mask", &space->source.b);
|
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->source.a = 0;
|
||||||
space->srcbpp = space->source.bits = from_bpp;
|
space->srcbpp = space->source.bits = from_bpp;
|
||||||
space->source.indexed = 0;
|
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, "red_mask", &space->dest.r);
|
||||||
gst_caps_get_int (to_caps, "green_mask", &space->dest.g);
|
gst_caps_get_int (to_caps, "green_mask", &space->dest.g);
|
||||||
gst_caps_get_int (to_caps, "blue_mask", &space->dest.b);
|
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->dest.a = 0;
|
||||||
space->destbpp = space->dest.bits = to_bpp;
|
space->destbpp = space->dest.bits = to_bpp;
|
||||||
space->dest.indexed = 0;
|
space->dest.indexed = 0;
|
||||||
|
|
Loading…
Reference in a new issue