cleaning up bad

Original commit message from CVS:
cleaning up bad
parent 69741017
# if USE_GCONFTOOL
# GCONF_DIR = gconf
# else
GCONF_DIR =
# endif
SUBDIRS = \
gst sys ext gst-libs \
$(GCONF_DIR) \
m4 common po
# disabled
# $(SUBDIRS_DOCS)
DIST_SUBDIRS = \
gst sys ext gst-libs \
gst sys ext \
m4 common po
EXTRA_DIST = \
gst-plugins.spec depcomp \
AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS \
gst-plugins-bad.spec depcomp \
AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
ChangeLog autogen.sh
DISTCLEANFILES = _stdint.h
# check that no marshal or enumtypes files are included
# this in turn ensures that distcheck fails for missing .list files which is currently
# shadowed when the corresponding .c and .h files are included.
distcheck-hook:
@test "x" = "x`find $(distdir) -name \*-enumtypes.[ch]`" && \
test "x" = "x`find $(distdir) -name \*-marshal.[ch]`" || \
( $(ECHO) "*** Leftover enumtypes or marshal files in the tarball." && \
$(ECHO) "*** Make sure the following files are not disted:" && \
find $(distdir) -name \*-enumtypes.[ch] && \
find $(distdir) -name \*-marshal.[ch] && \
false )
# include $(top_srcdir)/common/release.mak
# include $(top_srcdir)/common/po.mak
......@@ -12,12 +12,13 @@ AM_MAINTAINER_MODE
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 9, 0, 1, GST_CVS="no", GST_CVS="yes")
AS_VERSION(gst-plugins, GST_PLUGINS_BAD_VERSION, 0, 9, 0, 1,
GST_CVS="no", GST_CVS="yes")
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
dnl our libraries and install dirs use major.minor as a version
GST_MAJORMINOR=$GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR
GST_MAJORMINOR=$GST_PLUGINS_BAD_VERSION_MAJOR.$GST_PLUGINS_BAD_VERSION_MINOR
dnl we override it here if we need to for the release candidate of new series
GST_MAJORMINOR=0.9
AC_SUBST(GST_MAJORMINOR)
......@@ -441,6 +442,7 @@ ext/gsm/Makefile
common/Makefile
common/m4/Makefile
m4/Makefile
po/Makefile.in
)
AC_OUTPUT
......
......@@ -94,7 +94,8 @@ static gboolean gst_faad_setcaps (GstPad * pad, GstCaps * caps);
static GstCaps *gst_faad_srcgetcaps (GstPad * pad);
static gboolean gst_faad_event (GstPad * pad, GstEvent * event);
static GstFlowReturn gst_faad_chain (GstPad * pad, GstBuffer * buffer);
static GstElementStateReturn gst_faad_change_state (GstElement * element);
static GstStateChangeReturn gst_faad_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class; /* NULL */
......@@ -888,16 +889,16 @@ out:
return ret;
}
static GstElementStateReturn
gst_faad_change_state (GstElement * element)
static GstStateChangeReturn
gst_faad_change_state (GstElement * element, GstStateChange transition)
{
GstFaad *faad = GST_FAAD (element);
switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_NULL_TO_READY:
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
{
if (!(faad->handle = faacDecOpen ()))
return GST_STATE_FAILURE;
return GST_STATE_CHANGE_FAILURE;
else {
faacDecConfiguration *conf;
......@@ -906,11 +907,11 @@ gst_faad_change_state (GstElement * element)
/* conf->dontUpSampleImplicitSBR = 1; */
conf->outputFormat = FAAD_FMT_16BIT;
if (faacDecSetConfiguration (faad->handle, conf) == 0)
return GST_STATE_FAILURE;
return GST_STATE_CHANGE_FAILURE;
}
break;
}
case GST_STATE_PAUSED_TO_READY:
case GST_STATE_CHANGE_PAUSED_TO_READY:
faad->samplerate = -1;
faad->channels = -1;
faad->need_channel_setup = TRUE;
......@@ -919,7 +920,7 @@ gst_faad_change_state (GstElement * element)
faad->channel_positions = NULL;
faad->next_ts = 0;
break;
case GST_STATE_READY_TO_NULL:
case GST_STATE_CHANGE_READY_TO_NULL:
faacDecClose (faad->handle);
faad->handle = NULL;
if (faad->tempbuf) {
......@@ -932,9 +933,9 @@ gst_faad_change_state (GstElement * element)
}
if (GST_ELEMENT_CLASS (parent_class)->change_state)
return GST_ELEMENT_CLASS (parent_class)->change_state (element);
return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
return GST_STATE_SUCCESS;
return GST_STATE_CHANGE_SUCCESS;
}
static gboolean
......
This diff is collapsed.
......@@ -153,7 +153,8 @@ static GstElementClass *parent_class = NULL;
static void gst_qtdemux_class_init (GstQTDemuxClass * klass);
static void gst_qtdemux_base_init (GstQTDemuxClass * klass);
static void gst_qtdemux_init (GstQTDemux * quicktime_demux);
static GstElementStateReturn gst_qtdemux_change_state (GstElement * element);
static GstStateChangeReturn gst_qtdemux_change_state (GstElement * element,
GstStateChange transition);
static void gst_qtdemux_loop_header (GstPad * pad);
static gboolean qtdemux_sink_activate (GstPad * sinkpad);
static gboolean qtdemux_sink_activate_pull (GstPad * sinkpad, gboolean active);
......@@ -463,13 +464,13 @@ gst_qtdemux_handle_sink_event (GstQTDemux * qtdemux)
}
#endif
static GstElementStateReturn
gst_qtdemux_change_state (GstElement * element)
static GstStateChangeReturn
gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
{
GstQTDemux *qtdemux = GST_QTDEMUX (element);
switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_PAUSED_TO_READY:{
switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:{
gint n;
qtdemux->state = QTDEMUX_STATE_HEADER;
......@@ -489,7 +490,7 @@ gst_qtdemux_change_state (GstElement * element)
break;
}
return GST_ELEMENT_CLASS (parent_class)->change_state (element);
return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
}
static void
......
ext/audiofile/gstafsink.c
ext/audiofile/gstafsrc.c
ext/sndfile/gstsf.c
gst/avi/gstavimux.c
sys/dxr3/dxr3audiosink.c
sys/dxr3/dxr3audiosink.c
sys/dxr3/dxr3videosink.c
sys/oss/gstossmixer.c
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