diff options
| author | Peter Kjellerstedt <pkj@axis.com> | 2007-05-09 16:32:07 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-05-09 16:32:07 +0000 |
| commit | f38b77d70b6ffa643f09bcf5e81e4cd490f9d410 (patch) | |
| tree | 2624cb2379c4f7b590c38215be4b3c3d2d155919 /gst/gstparse.h | |
| parent | cb67757934dd63e6b818be0577b0dbefdac59cb3 (diff) | |
| download | gstreamer-f38b77d70b6ffa643f09bcf5e81e4cd490f9d410.tar.gz | |
gst/: Maintain API and ABI when --disable-parse is used. Now that we have an appropriate error code, we can just retu...
Original commit message from CVS:
Based on patch by: Peter Kjellerstedt <pkj at axis com>
* gst/Makefile.am:
* gst/gstparse.c: (gst_parse_launchv), (gst_parse_launch):
* gst/gstparse.h:
* gst/gstutils.c: (gst_parse_bin_from_description):
* gst/gstutils.h:
Maintain API and ABI when --disable-parse is used. Now that
we have an appropriate error code, we can just return NULL and the
appropriate error when gst_parse_launch() is used despite it having
been disabled (#342564).
* tests/check/Makefile.am:
* tests/check/pipelines/.cvsignore:
* tests/check/pipelines/parse-disabled.c:
Make sure these functions exist and return NULL plus a GError when
--disable-parse is used.
Diffstat (limited to 'gst/gstparse.h')
| -rw-r--r-- | gst/gstparse.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/gst/gstparse.h b/gst/gstparse.h index b21d1de8fa..39ebfc70b5 100644 --- a/gst/gstparse.h +++ b/gst/gstparse.h @@ -23,14 +23,10 @@ #ifndef __GST_PARSE_H__ #define __GST_PARSE_H__ -#include <gst/gstconfig.h> - #include <gst/gstelement.h> G_BEGIN_DECLS -#ifndef GST_DISABLE_PARSE - GQuark gst_parse_error_quark (void); /** * GST_PARSE_ERROR: @@ -66,15 +62,6 @@ typedef enum GstElement* gst_parse_launch (const gchar *pipeline_description, GError **error); GstElement* gst_parse_launchv (const gchar **argv, GError **error); -#else /* GST_DISABLE_PARSE */ - -#if defined _GNUC_ && _GNUC_ >= 3 -#pragma GCC poison gst_parse_launch -#pragma GCC poison gst_parse_launchv -#endif - -#endif /* GST_DISABLE_PARSE */ - G_END_DECLS #endif /* __GST_PARSE_H__ */ |