diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 13:22:43 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 13:22:43 +0100 |
| commit | a2a430024136fd947637ff56a4fea6a2689ca59d (patch) | |
| tree | 8cab3177242814f02b1e49a51d81b5f2f1660621 /gst/inter/gstintersurface.h | |
| parent | 071c6e8f15f2afff7ca4ce5934c3bae1d76aea95 (diff) | |
| parent | 8fb0beaf00aeae2ef6081d08f0d74d6e655a53da (diff) | |
| download | gstreamer-plugins-bad-a2a430024136fd947637ff56a4fea6a2689ca59d.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
ext/kate/gstkateenc.c
gst/colorspace/colorspace.c
gst/mpegvideoparse/mpegvideoparse.c
Diffstat (limited to 'gst/inter/gstintersurface.h')
| -rw-r--r-- | gst/inter/gstintersurface.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gst/inter/gstintersurface.h b/gst/inter/gstintersurface.h index 92440448a..d8ba11f4c 100644 --- a/gst/inter/gstintersurface.h +++ b/gst/inter/gstintersurface.h @@ -30,6 +30,7 @@ typedef struct _GstInterSurface GstInterSurface; struct _GstInterSurface { GMutex *mutex; + char *name; /* video */ GstVideoFormat format; @@ -45,12 +46,13 @@ struct _GstInterSurface int n_channels; GstBuffer *video_buffer; + GstBuffer *sub_buffer; GstAdapter *audio_adapter; }; GstInterSurface * gst_inter_surface_get (const char *name); -void gst_inter_surface_init (void); +void gst_inter_surface_unref (GstInterSurface *surface); G_END_DECLS |