Commit 3b9e6b3e authored by Thomas Vander Stichele's avatar Thomas Vander Stichele
Browse files

configure.ac: if we don't have glib, fail before testing 2.8

Original commit message from CVS:

* configure.ac:
if we don't have glib, fail before testing 2.8
* gst/base/gstbasetransform.c: (gst_base_transform_change_state):
fix a leak, should fix plugins-base testsuite
parent 3ef37179
2005-10-11 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:
if we don't have glib, fail before testing 2.8
* gst/base/gstbasetransform.c: (gst_base_transform_change_state):
fix a leak, should fix plugins-base testsuite
2005-10-11 Andy Wingo <wingo@pobox.com>
* gst/gstpad.c (pre_activate): Renamed from pre_activate_switch,
......
......@@ -227,7 +227,15 @@ GLIB2_REQ="2.6"
AC_SUBST(GLIB2_REQ)
dnl Check for glib2 with sugar on top
PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQ gobject-2.0 gthread-2.0 gmodule-2.0,HAVE_GLIB2=yes,HAVE_GLIB2=no)
PKG_CHECK_MODULES(GLIB2,
glib-2.0 >= $GLIB2_REQ gobject-2.0 gthread-2.0 gmodule-2.0,
HAVE_GLIB2=yes,
HAVE_GLIB2=no)
if test "x$HAVE_GLIB2" = "xno"; then
AC_MSG_ERROR([GStreamer requires GLib $GLIB2_REQ to compile.])
fi
dnl for the poor souls who for example have glib in /usr/local
AS_SCRUB_INCLUDE(GLIB2_CFLAGS)
GLIB_LIBS=$GLIB2_LIBS
......@@ -245,10 +253,6 @@ else
fi
AC_SUBST(GST_HAVE_GLIB_2_8_DEFINE)
if test "x$HAVE_GLIB2" = "xno"; then
AC_MSG_ERROR([GStreamer requires GLib $GLIB2_REQ to compile.])
fi
dnl Check for glib2 without extra fat, useful for the unversioned tool frontends
PKG_CHECK_MODULES(GLIB_ONLY, glib-2.0 >= $GLIB2_REQ)
AC_SUBST(GLIB_ONLY_CFLAGS)
......
......@@ -1335,13 +1335,14 @@ gst_base_transform_change_state (GstElement * element,
else
trans->have_same_caps = trans->passthrough;
GST_DEBUG_OBJECT (trans, "have_same_caps %d", trans->have_same_caps);
gst_caps_replace (&trans->cache_caps1, NULL);
gst_caps_replace (&trans->cache_caps2, NULL);
trans->negotiated = FALSE;
GST_UNLOCK (trans);
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_caps_replace (&trans->cache_caps1, NULL);
gst_caps_replace (&trans->cache_caps2, NULL);
default:
break;
}
......
......@@ -1335,13 +1335,14 @@ gst_base_transform_change_state (GstElement * element,
else
trans->have_same_caps = trans->passthrough;
GST_DEBUG_OBJECT (trans, "have_same_caps %d", trans->have_same_caps);
gst_caps_replace (&trans->cache_caps1, NULL);
gst_caps_replace (&trans->cache_caps2, NULL);
trans->negotiated = FALSE;
GST_UNLOCK (trans);
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_caps_replace (&trans->cache_caps1, NULL);
gst_caps_replace (&trans->cache_caps2, NULL);
default:
break;
}
......
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