mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 05:59:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix various inconsistencies discovered while attempting to fix --disable-*.

Browse source 
Original commit message from CVS:
Fix various inconsistencies discovered while attempting to fix --disable-*.
Uraeus: this should fix the bison.simple problem that you've had.
This commit is contained in:
Erik Walthinsen 2003-02-10 07:53:58 +00:00
parent f85c54a3b8
commit 0da768dacb
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst/autoplug/autoplugtest.c
View file

@ -1,4 +1,5 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
GstElement *pipeline, *src, *autobin, *cache, *typefind, *decoder, *sink; GstElement *pipeline, *src, *autobin, *cache, *typefind, *decoder, *sink;

4
gst/elements/gstfakesrc.c
View file

@ -153,7 +153,7 @@ gst_fakesrc_filltype_get_type (void)
static void gst_fakesrc_class_init (GstFakeSrcClass *klass); static void gst_fakesrc_class_init (GstFakeSrcClass *klass);
static void gst_fakesrc_init (GstFakeSrc *fakesrc); static void gst_fakesrc_init (GstFakeSrc *fakesrc);
static GstPad* gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ); static GstPad* gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ,const gchar *unused);
static void gst_fakesrc_update_functions (GstFakeSrc *src); static void gst_fakesrc_update_functions (GstFakeSrc *src);
static void gst_fakesrc_set_property (GObject *object, guint prop_id, static void gst_fakesrc_set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec); const GValue *value, GParamSpec *pspec);
@ -293,7 +293,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc)
} }
static GstPad* static GstPad*
gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ) gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar *unused)
{ {
gchar *name; gchar *name;
GstPad *srcpad; GstPad *srcpad;

5
gst/gstbin.c
View file

@ -49,7 +49,7 @@ static void gst_bin_dispose (GObject * object);
static GstElementStateReturn gst_bin_change_state (GstElement *element); static GstElementStateReturn gst_bin_change_state (GstElement *element);
static GstElementStateReturn gst_bin_change_state_norecurse (GstBin *bin); static GstElementStateReturn gst_bin_change_state_norecurse (GstBin *bin);
static void gst_bin_set_index (GstBin *bin, GstIndex *index); static void gst_bin_set_index (GstElement *element, GstIndex *index);
static void gst_bin_add_func (GstBin *bin, GstElement *element); static void gst_bin_add_func (GstBin *bin, GstElement *element);
static void gst_bin_remove_func (GstBin *bin, GstElement *element); static void gst_bin_remove_func (GstBin *bin, GstElement *element);
@ -224,9 +224,10 @@ gst_bin_auto_clock (GstBin *bin)
} }
static void static void
gst_bin_set_index (GstBin *bin, GstIndex *index) gst_bin_set_index (GstElement *element, GstIndex *index)
{ {
GList *children; GList *children;
GstBin *bin = GST_BIN (element);
g_return_if_fail (GST_IS_BIN (bin)); g_return_if_fail (GST_IS_BIN (bin));

1
gst/parse/grammar.y
View file

@ -2,6 +2,7 @@
#include <glib.h> #include <glib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h>
#include "../gstparse.h" #include "../gstparse.h"
#include "types.h" #include "types.h"

17
gst/schedulers/gstbasicscheduler.c
View file

@ -265,8 +265,8 @@ GstPluginDesc plugin_desc = {
plugin_init plugin_init
}; };
static int static void
gst_basic_scheduler_loopfunc_wrapper (int argc, char *argv[]) gst_basic_scheduler_loopfunc_wrapper (int argc, void **argv)
{ {
GstElement *element = GST_ELEMENT_CAST (argv); GstElement *element = GST_ELEMENT_CAST (argv);
G_GNUC_UNUSED const gchar *name = GST_ELEMENT_NAME (element); G_GNUC_UNUSED const gchar *name = GST_ELEMENT_NAME (element);
@ -294,11 +294,10 @@ gst_basic_scheduler_loopfunc_wrapper (int argc, char *argv[])
GST_DEBUG_LEAVE ("(%d,'%s')", argc, name); GST_DEBUG_LEAVE ("(%d,'%s')", argc, name);
gst_object_unref (GST_OBJECT (element)); gst_object_unref (GST_OBJECT (element));
return 0;
} }
static int static void
gst_basic_scheduler_chain_wrapper (int argc, char *argv[]) gst_basic_scheduler_chain_wrapper (int argc, void **argv)
{ {
GstElement *element = GST_ELEMENT_CAST (argv); GstElement *element = GST_ELEMENT_CAST (argv);
G_GNUC_UNUSED const gchar *name = GST_ELEMENT_NAME (element); G_GNUC_UNUSED const gchar *name = GST_ELEMENT_NAME (element);
@ -357,11 +356,10 @@ gst_basic_scheduler_chain_wrapper (int argc, char *argv[])
GST_DEBUG_LEAVE ("(%d,'%s')", argc, name); GST_DEBUG_LEAVE ("(%d,'%s')", argc, name);
gst_object_unref (GST_OBJECT (element)); gst_object_unref (GST_OBJECT (element));
return 0;
} }
static int static void
gst_basic_scheduler_src_wrapper (int argc, char *argv[]) gst_basic_scheduler_src_wrapper (int argc, void **argv)
{ {
GstElement *element = GST_ELEMENT_CAST (argv); GstElement *element = GST_ELEMENT_CAST (argv);
GList *pads; GList *pads;
@ -383,7 +381,7 @@ gst_basic_scheduler_src_wrapper (int argc, char *argv[])
pads = g_list_next (pads); pads = g_list_next (pads);
if (GST_RPAD_DIRECTION (realpad) == GST_PAD_SRC && GST_PAD_IS_USABLE (realpad)) { if (GST_RPAD_DIRECTION (realpad) == GST_PAD_SRC && GST_PAD_IS_USABLE (realpad)) {
GST_DEBUG (GST_CAT_DATAFLOW, "calling _getfunc for %s:%s", GST_DEBUG_PAD_NAME (realpad)); GST_DEBUG (GST_CAT_DATAFLOW, "calling _getfunc for %s:%s", GST_DEBUG_PAD_NAME (realpad));
g_return_val_if_fail (GST_RPAD_GETFUNC (realpad) != NULL, 0); g_return_if_fail (GST_RPAD_GETFUNC (realpad) != NULL);
buf = GST_RPAD_GETFUNC (realpad) (GST_PAD_CAST (realpad)); buf = GST_RPAD_GETFUNC (realpad) (GST_PAD_CAST (realpad));
if (buf) { if (buf) {
GST_DEBUG (GST_CAT_DATAFLOW, "calling gst_pad_push on pad %s:%s %p", GST_DEBUG (GST_CAT_DATAFLOW, "calling gst_pad_push on pad %s:%s %p",
@ -403,7 +401,6 @@ gst_basic_scheduler_src_wrapper (int argc, char *argv[])
SCHED (element)->current = NULL; SCHED (element)->current = NULL;
GST_DEBUG_LEAVE (""); GST_DEBUG_LEAVE ("");
return 0;
} }
static void static void

4
plugins/elements/gstfakesrc.c
View file

@ -153,7 +153,7 @@ gst_fakesrc_filltype_get_type (void)
static void gst_fakesrc_class_init (GstFakeSrcClass *klass); static void gst_fakesrc_class_init (GstFakeSrcClass *klass);
static void gst_fakesrc_init (GstFakeSrc *fakesrc); static void gst_fakesrc_init (GstFakeSrc *fakesrc);
static GstPad* gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ); static GstPad* gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ,const gchar *unused);
static void gst_fakesrc_update_functions (GstFakeSrc *src); static void gst_fakesrc_update_functions (GstFakeSrc *src);
static void gst_fakesrc_set_property (GObject *object, guint prop_id, static void gst_fakesrc_set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec); const GValue *value, GParamSpec *pspec);
@ -293,7 +293,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc)
} }
static GstPad* static GstPad*
gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ) gst_fakesrc_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar *unused)
{ {
gchar *name; gchar *name;
GstPad *srcpad; GstPad *srcpad;