diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-05-20 12:07:45 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-05-20 12:07:45 +0200 |
| commit | a9edf7c6aad8a25ce5eeac832a22e67a888f85e0 (patch) | |
| tree | 1bf82791084af0187c5eb6713a76ce99b37ae65d /gst/gstpreset.c | |
| parent | 67cd7fd0a21be58b924b8d05d182d8cab2ea4948 (diff) | |
| parent | aa2bfc9b7fc1a1b7264624f749158fad986d18b5 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
docs/plugins/gstreamer-plugins.hierarchy
Diffstat (limited to 'gst/gstpreset.c')
| -rw-r--r-- | gst/gstpreset.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gst/gstpreset.c b/gst/gstpreset.c index 99a5755f4..b958baac5 100644 --- a/gst/gstpreset.c +++ b/gst/gstpreset.c @@ -86,6 +86,8 @@ #include "gst_private.h" #include "gstpreset.h" +#include "gstinfo.h" +#include "gstvalue.h" #ifdef HAVE_UNISTD_H #include <unistd.h> |