diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-15 16:52:44 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-15 16:52:44 +0000 |
| commit | d405ea2e632363e560dd3784177f249196bb2bc1 (patch) | |
| tree | d9f5154a98915aa56a6dbfc13ebf4748a68d4163 /gst/faceoverlay/gstfaceoverlay.h | |
| parent | fead44ad128ddbb054d108ce9489233a04069d65 (diff) | |
| download | gstreamer-plugins-bad-d405ea2e632363e560dd3784177f249196bb2bc1.tar.gz | |
faceoverlay: fix weird pad creation code
The element would create normal pads in its instance_init function,
and then later in NULL->READY create the elements it needs, remove
the pads created in the instance_init function, and add new ghost
pads instead. Not without saving the external peer pads of the old
pads of course, which it would promptly re-link to the new ghost
pads. Do all of that a bit differently.
Fixes the generic/states.check unit test.
https://bugzilla.gnome.org/show_bug.cgi?id=670588
Diffstat (limited to 'gst/faceoverlay/gstfaceoverlay.h')
| -rw-r--r-- | gst/faceoverlay/gstfaceoverlay.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/faceoverlay/gstfaceoverlay.h b/gst/faceoverlay/gstfaceoverlay.h index 7b8e50c00..7f4427c28 100644 --- a/gst/faceoverlay/gstfaceoverlay.h +++ b/gst/faceoverlay/gstfaceoverlay.h @@ -1,5 +1,4 @@ -/* - * GStreamer faceoverlay plugin +/* GStreamer faceoverlay plugin * Copyright (C) 2011 Laura Lucas Alday <lauralucas@gmail.com> * * Permission is hereby granted, free of charge, to any person obtaining a @@ -47,7 +46,7 @@ #include <gst/gst.h> G_BEGIN_DECLS -/* #defines don't like whitespacey bits */ + #define GST_TYPE_FACEOVERLAY \ (gst_face_overlay_get_type()) #define GST_FACEOVERLAY(obj) \ @@ -58,6 +57,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FACEOVERLAY)) #define GST_IS_FACEOVERLAY_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FACEOVERLAY)) + typedef struct _GstFaceOverlay GstFaceOverlay; typedef struct _GstFaceOverlayClass GstFaceOverlayClass; @@ -88,4 +88,5 @@ struct _GstFaceOverlayClass GType gst_face_overlay_get_type (void); G_END_DECLS + #endif /* __GST_FACEOVERLAY_H__ */ |