diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-08-24 18:16:15 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-08-24 18:20:32 +0100 |
| commit | d652fff69005e20327d2a36484ee872174a5eb63 (patch) | |
| tree | f50ec8b8d452b1ad2a305803abfcb26ecfef57a8 | |
| parent | 2004db26d7fb7aab37dcd9ceec2f95bd93fcd548 (diff) | |
| download | gstreamer-plugins-bad-d652fff69005e20327d2a36484ee872174a5eb63.tar.gz | |
amrwbenc: use different element GType name to avoid conflict with previous plugin
Use a different GType name for the element to avoid 'cannot register existing type'
warnings when running 'make check' in the unpacked tarball with the old amrwb plugin
also installed as system plugin under the old name (it used to be called 'amrwrb'
and now it's 'amrwbenc').
| -rw-r--r-- | ext/amrwbenc/gstamrwbenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/amrwbenc/gstamrwbenc.c b/ext/amrwbenc/gstamrwbenc.c index 3b46d3e9a..f9587cc50 100644 --- a/ext/amrwbenc/gstamrwbenc.c +++ b/ext/amrwbenc/gstamrwbenc.c @@ -73,7 +73,7 @@ gst_amrwbenc_bandmode_get_type () }; if (!gst_amrwbenc_bandmode_type) { gst_amrwbenc_bandmode_type = - g_enum_register_static ("GstAmrwbEncBandMode", gst_amrwbenc_bandmode); + g_enum_register_static ("GstAmrWbEncBandMode", gst_amrwbenc_bandmode); } return gst_amrwbenc_bandmode_type; } @@ -132,7 +132,10 @@ _do_init (GType object_type) "AMR-WB audio encoder"); } -GST_BOILERPLATE_FULL (GstAmrwbEnc, gst_amrwbenc, GstElement, GST_TYPE_ELEMENT, +#define GstAmrWbEnc GstAmrwbEnc +#define GstAmrWbEncClass GstAmrwbEncClass + +GST_BOILERPLATE_FULL (GstAmrWbEnc, gst_amrwbenc, GstElement, GST_TYPE_ELEMENT, _do_init); static void |