diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-09-17 10:53:12 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-09-17 12:25:25 +0100 |
| commit | 59c54c7a661f2b87b3a4a91ba9743641414c4d9c (patch) | |
| tree | 1e7a1eeb54a2de4f82f2472ec4773de419bbe3c9 /ext/cdio/gstcdio.c | |
| parent | 45815d7ec4b082a0b46bb4c5d106eb1b4f30119b (diff) | |
cdio: work around cdio headers re-defining VERSION and PACKAGE_VERSION
Thanks guys. Fixes plugin version in gst-inspect-1.0 and docs
introspection/updating for this plugin.
Diffstat (limited to 'ext/cdio/gstcdio.c')
| -rw-r--r-- | ext/cdio/gstcdio.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c index 483ebf5c..97737dd2 100644 --- a/ext/cdio/gstcdio.c +++ b/ext/cdio/gstcdio.c @@ -22,6 +22,17 @@ #include "config.h" #endif +#include <gst/gst.h> + +static gboolean plugin_init (GstPlugin * plugin); + +/* cdio headers redefine VERSION etc., so do this here before including them */ +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + cdio, + "Read audio from audio CDs", + plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) + #include "gstcdio.h" #include "gstcdiocddasrc.h" @@ -136,10 +147,3 @@ plugin_init (GstPlugin * plugin) return TRUE; } - - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - cdio, - "Read audio from audio CDs", - plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) |