mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 23:06:49 +00:00
gst/subparse/: Use GST_DISABLE_XML here
Original commit message from CVS: * gst/subparse/gstsubparse.c: * gst/subparse/samiparse.c: Use GST_DISABLE_XML here * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_put), (gst_xvimagesink_xwindow_new), (gst_xvimagesink_get_xv_support), (gst_xvimagesink_buffer_alloc), (gst_xvimagesink_navigation_send_event): * sys/xvimage/xvimagesink.h: Include stdlib.h when using atoi. * tests/check/elements/playbin.c: (playbin_suite): Use GST_DISABLE_REGISTRY here
This commit is contained in:
parent
38db14cb22
commit
23a2a0e224
6 changed files with 48 additions and 31 deletions
16
ChangeLog
16
ChangeLog
|
@ -1,3 +1,19 @@
|
|||
2007-04-20 Stefan Kost <ensonic@users.sf.net>
|
||||
|
||||
* gst/subparse/gstsubparse.c:
|
||||
* gst/subparse/samiparse.c:
|
||||
Use GST_DISABLE_XML here
|
||||
|
||||
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_put),
|
||||
(gst_xvimagesink_xwindow_new), (gst_xvimagesink_get_xv_support),
|
||||
(gst_xvimagesink_buffer_alloc),
|
||||
(gst_xvimagesink_navigation_send_event):
|
||||
* sys/xvimage/xvimagesink.h:
|
||||
Include stdlib.h when using atoi.
|
||||
|
||||
* tests/check/elements/playbin.c: (playbin_suite):
|
||||
Use GST_DISABLE_REGISTRY here
|
||||
|
||||
2007-04-19 Michael Smith <msmith@fluendo.com>
|
||||
|
||||
* ext/theora/gsttheoraenc.h:
|
||||
|
|
|
@ -59,7 +59,7 @@ GST_ELEMENT_DETAILS ("Subtitle parser",
|
|||
"Gustavo J. A. M. Carneiro <gjc@inescporto.pt>\n"
|
||||
"Ronald S. Bultje <rbultje@ronald.bitfreak.net>");
|
||||
|
||||
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
|
||||
#ifndef GST_DISABLE_XML
|
||||
static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_PAD_SINK,
|
||||
GST_PAD_ALWAYS,
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include "samiparse.h"
|
||||
|
||||
/* FIXME: use Makefile stuff */
|
||||
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
|
||||
#ifndef GST_DISABLE_XML
|
||||
#include <libxml/HTMLparser.h>
|
||||
#include <string.h>
|
||||
|
||||
|
@ -435,7 +435,7 @@ parse_sami (ParserState * state, const gchar * line)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
#else /* GST_DISABLE_LOADSAVE_REGISTRY */
|
||||
#else /* GST_DISABLE_XML */
|
||||
|
||||
gchar *
|
||||
parse_sami (ParserState * state, const gchar * line)
|
||||
|
@ -462,4 +462,4 @@ sami_context_reset (ParserState * state)
|
|||
return;
|
||||
}
|
||||
|
||||
#endif /* GST_DISABLE_LOADSAVE_REGISTRY */
|
||||
#endif /* GST_DISABLE_XML */
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <gst/base/gstpushsrc.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
|
||||
#ifndef GST_DISABLE_REGISTRY
|
||||
|
||||
#define DEFINE_TEST(func) \
|
||||
static void func (void); \
|
||||
|
@ -591,7 +591,7 @@ GST_PLUGIN_DEFINE_STATIC
|
|||
"static elements for the playbin unit test",
|
||||
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
|
||||
|
||||
#endif /* GST_DISABLE_LOADSAVE_REGISTRY */
|
||||
#endif /* GST_DISABLE_REGISTRY */
|
||||
|
||||
|
||||
static Suite *
|
||||
|
@ -602,7 +602,7 @@ playbin_suite (void)
|
|||
|
||||
suite_add_tcase (s, tc_chain);
|
||||
|
||||
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
|
||||
#ifndef GST_DISABLE_REGISTRY
|
||||
/* with the old decodebin */
|
||||
tcase_add_test (tc_chain, test_sink_usage_video_only_stream_decodebin1);
|
||||
tcase_add_test (tc_chain, test_suburi_error_wrongproto_decodebin1);
|
||||
|
|
Loading…
Reference in a new issue