diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-12-30 11:41:17 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-12-30 11:41:17 +0100 |
| commit | f70a623418a52eada0278002f8d266d49957b3d5 (patch) | |
| tree | fc54fd9fab400e886b11a9a2b313478b66dd7969 /ext/kate/gstkatetiger.h | |
| parent | d5aaefa59f9ef4153644a2aa254c39a3a9d108e3 (diff) | |
| parent | d465188879cd4dd0735e3fbcaeb83d98f217ed88 (diff) | |
| download | gstreamer-plugins-bad-f70a623418a52eada0278002f8d266d49957b3d5.tar.gz | |
Merge remote-tracking branch 'origin/master' into 0.11-premerge
Conflicts:
docs/libs/Makefile.am
ext/kate/gstkatetiger.c
ext/opus/gstopusdec.c
ext/xvid/gstxvidenc.c
gst-libs/gst/basecamerabinsrc/Makefile.am
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideoencoder.c
gst/asfmux/gstasfmux.c
gst/audiovisualizers/gstwavescope.c
gst/camerabin2/gstcamerabin2.c
gst/debugutils/gstcompare.c
gst/frei0r/gstfrei0rmixer.c
gst/mpegpsmux/mpegpsmux.c
gst/mpegtsmux/mpegtsmux.c
gst/mxf/mxfmux.c
gst/videomeasure/gstvideomeasure_ssim.c
gst/videoparsers/gsth264parse.c
gst/videoparsers/gstmpeg4videoparse.c
Diffstat (limited to 'ext/kate/gstkatetiger.h')
| -rw-r--r-- | ext/kate/gstkatetiger.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/kate/gstkatetiger.h b/ext/kate/gstkatetiger.h index f966cbf15..ad7cb1433 100644 --- a/ext/kate/gstkatetiger.h +++ b/ext/kate/gstkatetiger.h @@ -50,6 +50,7 @@ #include <tiger/tiger.h> #include <gst/gst.h> #include <gst/video/video.h> +#include <gst/video/video-overlay-composition.h> #include "gstkateutil.h" G_BEGIN_DECLS @@ -95,7 +96,8 @@ struct _GstKateTiger gint video_width; gint video_height; gboolean swap_rgb; - guint8 *render_buffer; + GstBuffer *render_buffer; + GstVideoOverlayComposition *composition; GMutex *mutex; GCond *cond; |