From 9ca3734e5218f97fde1ffdd30d2d374b1612e8c3 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 28 Oct 2011 15:16:43 +0200 Subject: [PATCH] make elements compile again --- ext/kate/gstkatedec.c | 2 +- ext/kate/gstkateutil.c | 6 +++--- gst-libs/gst/Makefile.am | 2 +- gst/dataurisrc/gstdataurisrc.c | 2 +- gst/mpegtsdemux/tsdemux.c | 28 ++++++++++++++-------------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ext/kate/gstkatedec.c b/ext/kate/gstkatedec.c index 901f9b40ea..6b1ee73d4c 100644 --- a/ext/kate/gstkatedec.c +++ b/ext/kate/gstkatedec.c @@ -289,7 +289,7 @@ gst_kate_dec_chain (GstPad * pad, GstBuffer * buf) buffer = gst_buffer_new_and_alloc (len + 1); if (G_LIKELY (buffer)) { const char *mime = plain ? "text/plain" : "text/x-pango-markup"; - GstCaps *caps = gst_caps_new_simple (mime, NULL); + GstCaps *caps = gst_caps_new_empty_simple (mime); gst_caps_unref (caps); /* allocate and copy the NULs, but don't include them in passed size */ gst_buffer_fill (buffer, 0, escaped, len + 1); diff --git a/ext/kate/gstkateutil.c b/ext/kate/gstkateutil.c index 811a838d4d..0bcb74b144 100644 --- a/ext/kate/gstkateutil.c +++ b/ext/kate/gstkateutil.c @@ -295,11 +295,11 @@ gst_kate_util_decoder_base_chain_kate_packet (GstKateDecoderBase * decoder, } if (strcmp (decoder->k.ki->category, "K-SPU") == 0 || strcmp (decoder->k.ki->category, "spu-subtitles") == 0) { - *src_caps = gst_caps_new_simple ("video/x-dvd-subpicture", NULL); + *src_caps = gst_caps_new_empty_simple ("video/x-dvd-subpicture"); } else if (decoder->k.ki->text_markup_type == kate_markup_none) { - *src_caps = gst_caps_new_simple ("text/plain", NULL); + *src_caps = gst_caps_new_empty_simple ("text/plain"); } else { - *src_caps = gst_caps_new_simple ("text/x-pango-markup", NULL); + *src_caps = gst_caps_new_empty_simple ("text/x-pango-markup"); } GST_INFO_OBJECT (srcpad, "Setting caps: %" GST_PTR_FORMAT, *src_caps); if (!gst_pad_set_caps (srcpad, *src_caps)) { diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index 130956ee4c..d790c518e5 100644 --- a/gst-libs/gst/Makefile.am +++ b/gst-libs/gst/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = interfaces signalprocessor video basecamerabinsrc codecparsers +SUBDIRS = interfaces signalprocessor codecparsers noinst_HEADERS = gst-i18n-plugin.h gettext.h DIST_SUBDIRS = interfaces signalprocessor video basecamerabinsrc codecparsers diff --git a/gst/dataurisrc/gstdataurisrc.c b/gst/dataurisrc/gstdataurisrc.c index ef9e328c14..c4be942789 100644 --- a/gst/dataurisrc/gstdataurisrc.c +++ b/gst/dataurisrc/gstdataurisrc.c @@ -389,7 +389,7 @@ gst_data_uri_src_set_uri (GstURIHandler * handler, const gchar * uri) caps = gst_type_find_helper_for_buffer (GST_OBJECT (src), buffer, NULL); if (!caps) - caps = gst_caps_new_simple (mimetype, NULL); + caps = gst_caps_new_empty_simple (mimetype); gst_base_src_set_caps (GST_BASE_SRC_CAST (src), caps); gst_caps_unref (caps); diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c index 4bc3de8c26..4c6762925e 100644 --- a/gst/mpegtsdemux/tsdemux.c +++ b/gst/mpegtsdemux/tsdemux.c @@ -989,7 +989,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream, GST_LOG ("ac3 audio"); template = gst_static_pad_template_get (&audio_template); name = g_strdup_printf ("audio_%04x", bstream->pid); - caps = gst_caps_new_simple ("audio/x-ac3", NULL); + caps = gst_caps_new_empty_simple ("audio/x-ac3"); g_free (desc); break; } @@ -1000,7 +1000,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream, GST_LOG ("ac3 audio"); template = gst_static_pad_template_get (&audio_template); name = g_strdup_printf ("audio_%04x", bstream->pid); - caps = gst_caps_new_simple ("audio/x-eac3", NULL); + caps = gst_caps_new_empty_simple ("audio/x-eac3"); g_free (desc); break; } @@ -1011,7 +1011,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream, GST_LOG ("teletext"); template = gst_static_pad_template_get (&private_template); name = g_strdup_printf ("private_%04x", bstream->pid); - caps = gst_caps_new_simple ("private/teletext", NULL); + caps = gst_caps_new_empty_simple ("private/teletext"); g_free (desc); break; } @@ -1022,7 +1022,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream, GST_LOG ("subtitling"); template = gst_static_pad_template_get (&private_template); name = g_strdup_printf ("private_%04x", bstream->pid); - caps = gst_caps_new_simple ("subpicture/x-dvb", NULL); + caps = gst_caps_new_empty_simple ("subpicture/x-dvb"); g_free (desc); } /* hack for itv hd (sid 10510, video pid 3401 */ @@ -1086,7 +1086,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream, /* dirac in hex */ template = gst_static_pad_template_get (&video_template); name = g_strdup_printf ("video_%04x", bstream->pid); - caps = gst_caps_new_simple ("video/x-dirac", NULL); + caps = gst_caps_new_empty_simple ("video/x-dirac"); } } g_free (desc); @@ -1121,7 +1121,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream, if (DESC_REGISTRATION_format_identifier (desc) == DRF_ID_HDMV) { template = gst_static_pad_template_get (&audio_template); name = g_strdup_printf ("audio_%04x", bstream->pid); - caps = gst_caps_new_simple ("audio/x-eac3", NULL); + caps = gst_caps_new_empty_simple ("audio/x-eac3"); } g_free (desc); } @@ -1135,7 +1135,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream, if (desc) { template = gst_static_pad_template_get (&audio_template); name = g_strdup_printf ("audio_%04x", bstream->pid); - caps = gst_caps_new_simple ("audio/x-eac3", NULL); + caps = gst_caps_new_empty_simple ("audio/x-eac3"); g_free (desc); break; } @@ -1152,38 +1152,38 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream, g_free (desc); template = gst_static_pad_template_get (&audio_template); name = g_strdup_printf ("audio_%04x", bstream->pid); - caps = gst_caps_new_simple ("audio/x-ac3", NULL); + caps = gst_caps_new_empty_simple ("audio/x-ac3"); break; } case ST_BD_AUDIO_EAC3: template = gst_static_pad_template_get (&audio_template); name = g_strdup_printf ("audio_%04x", bstream->pid); - caps = gst_caps_new_simple ("audio/x-eac3", NULL); + caps = gst_caps_new_empty_simple ("audio/x-eac3"); break; case ST_PS_AUDIO_DTS: template = gst_static_pad_template_get (&audio_template); name = g_strdup_printf ("audio_%04x", bstream->pid); - caps = gst_caps_new_simple ("audio/x-dts", NULL); + caps = gst_caps_new_empty_simple ("audio/x-dts"); break; case ST_PS_AUDIO_LPCM: template = gst_static_pad_template_get (&audio_template); name = g_strdup_printf ("audio_%04x", bstream->pid); - caps = gst_caps_new_simple ("audio/x-lpcm", NULL); + caps = gst_caps_new_empty_simple ("audio/x-lpcm"); break; case ST_BD_AUDIO_LPCM: template = gst_static_pad_template_get (&audio_template); name = g_strdup_printf ("audio_%04x", bstream->pid); - caps = gst_caps_new_simple ("audio/x-private-ts-lpcm", NULL); + caps = gst_caps_new_empty_simple ("audio/x-private-ts-lpcm"); break; case ST_PS_DVD_SUBPICTURE: template = gst_static_pad_template_get (&subpicture_template); name = g_strdup_printf ("subpicture_%04x", bstream->pid); - caps = gst_caps_new_simple ("video/x-dvd-subpicture", NULL); + caps = gst_caps_new_empty_simple ("video/x-dvd-subpicture"); break; case ST_BD_PGS_SUBPICTURE: template = gst_static_pad_template_get (&subpicture_template); name = g_strdup_printf ("subpicture_%04x", bstream->pid); - caps = gst_caps_new_simple ("subpicture/x-pgs", NULL); + caps = gst_caps_new_empty_simple ("subpicture/x-pgs"); break; default: GST_WARNING ("Non-media stream (stream_type:0x%x). Not creating pad",