summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2011-05-03 09:41:48 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2011-05-03 09:42:58 +0200
commit5fe9bcd989cdfb4d540baab90cad32c5b4873752 (patch)
tree794337828542c8eab37ce5048cb259743c105c2c /gst
parent2243adffa128c6f508b0926ee00bfb1b18fead5e (diff)
parent11ac49e6c4d6a90b8ef55c66772d5a217de95d94 (diff)
Merge branch 'master' into 0.11
Conflicts: configure.ac gst/gstbus.c
Diffstat (limited to 'gst')
-rw-r--r--gst/gstpluginfeature.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/gst/gstpluginfeature.h b/gst/gstpluginfeature.h
index b731a86710..c24be4f759 100644
--- a/gst/gstpluginfeature.h
+++ b/gst/gstpluginfeature.h
@@ -26,6 +26,7 @@
#include <glib-object.h>
#include <gst/gstobject.h>
+#include <gst/gstplugin.h>
G_BEGIN_DECLS