diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-28 12:06:12 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-28 12:06:12 +0100 |
| commit | 2eb38991c6d67e47ef90246b2561588cf4b5f390 (patch) | |
| tree | aa84497e9b719c9a2c1a5bf8657a3cdcae32c9d6 /ext/kate/gstkatedec.h | |
| parent | 670c883f401367e2591f446e63b5102cb2aba72f (diff) | |
| parent | a68137c4dcdbf3dce5cd278403478aef1de62f59 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
win32/common/config.h
Diffstat (limited to 'ext/kate/gstkatedec.h')
| -rw-r--r-- | ext/kate/gstkatedec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/kate/gstkatedec.h b/ext/kate/gstkatedec.h index a7011ecbc..b4d99059a 100644 --- a/ext/kate/gstkatedec.h +++ b/ext/kate/gstkatedec.h @@ -67,12 +67,12 @@ typedef struct _GstKateDecClass GstKateDecClass; struct _GstKateDec { - GstElement element; + GstKateDecoderBase decoder; GstPad *sinkpad; GstPad *srcpad; - GstKateDecoderBase decoder; + GstCaps *src_caps; gboolean remove_markup; }; |