diff --git a/configure.ac b/configure.ac index 257c31d46e..5116ab46b4 100644 --- a/configure.ac +++ b/configure.ac @@ -211,7 +211,7 @@ dnl *** plug-ins to include *** dnl Non ported plugins (non-dependant, then dependant) dnl Make sure you have a space before and after all plugins GST_PLUGINS_NONPORTED=" iec958 synaesthesia xingmux \ - mpegstream realmedia cdio twolame " + mpegstream cdio twolame " AC_SUBST(GST_PLUGINS_NONPORTED) dnl these are all the gst plug-ins, compilable without additional libs diff --git a/gst/realmedia/rademux.c b/gst/realmedia/rademux.c index b007938030..e000e2d04b 100644 --- a/gst/realmedia/rademux.c +++ b/gst/realmedia/rademux.c @@ -410,7 +410,7 @@ gst_real_audio_demux_parse_header (GstRealAudioDemux * demux) /* Sipro/ACELP.NET Voice Codec (MIME unknown) */ case GST_RM_AUD_SIPR: - caps = gst_caps_new_simple ("audio/x-sipro", NULL); + caps = gst_caps_new_empty_simple ("audio/x-sipro"); break; default: @@ -466,7 +466,7 @@ gst_real_audio_demux_parse_header (GstRealAudioDemux * demux) if (codec_name) { if (demux->pending_tags == NULL) - demux->pending_tags = gst_tag_list_new (); + demux->pending_tags = gst_tag_list_new_empty (); gst_tag_list_add (demux->pending_tags, GST_TAG_MERGE_REPLACE, GST_TAG_AUDIO_CODEC, codec_name, NULL); @@ -526,8 +526,8 @@ gst_real_audio_demux_parse_data (GstRealAudioDemux * demux) } if (demux->pending_tags) { - gst_element_found_tags_for_pad (GST_ELEMENT (demux), demux->srcpad, - demux->pending_tags); + gst_pad_push_event (demux->srcpad, + gst_event_new_tag (demux->pending_tags)); demux->pending_tags = NULL; } diff --git a/gst/realmedia/rdtdepay.c b/gst/realmedia/rdtdepay.c index 3c97dea29f..4b617a1b1f 100644 --- a/gst/realmedia/rdtdepay.c +++ b/gst/realmedia/rdtdepay.c @@ -192,7 +192,7 @@ gst_rdt_depay_setcaps (GstPad * pad, GstCaps * caps) rdtdepay->clock_rate = clock_rate; /* set caps on pad and on header */ - srccaps = gst_caps_new_simple ("application/vnd.rn-realmedia", NULL); + srccaps = gst_caps_new_empty_simple ("application/vnd.rn-realmedia"); gst_pad_set_caps (rdtdepay->srcpad, srccaps); gst_caps_unref (srccaps); diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c index 71eabab7b6..a883cebf58 100644 --- a/gst/realmedia/rmdemux.c +++ b/gst/realmedia/rmdemux.c @@ -1390,7 +1390,7 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream) /* Sony ATRAC3 */ case GST_RM_AUD_ATRC: - stream_caps = gst_caps_new_simple ("audio/x-vnd.sony.atrac3", NULL); + stream_caps = gst_caps_new_empty_simple ("audio/x-vnd.sony.atrac3"); stream->needs_descrambling = TRUE; stream->subpackets_needed = stream->height; stream->subpackets = NULL; @@ -1407,7 +1407,7 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream) /* RALF is lossless */ case GST_RM_AUD_RALF: GST_DEBUG_OBJECT (rmdemux, "RALF"); - stream_caps = gst_caps_new_simple ("audio/x-ralf-mpeg4-generic", NULL); + stream_caps = gst_caps_new_empty_simple ("audio/x-ralf-mpeg4-generic"); break; case GST_RM_AUD_SIPR: @@ -1420,7 +1420,7 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream) } GST_DEBUG_OBJECT (rmdemux, "SIPR"); - stream_caps = gst_caps_new_simple ("audio/x-sipro", NULL); + stream_caps = gst_caps_new_empty_simple ("audio/x-sipro"); stream->needs_descrambling = TRUE; stream->subpackets_needed = stream->height; stream->subpackets = NULL; @@ -1508,7 +1508,7 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream) /* save for later, we must send the tags after the newsegment event */ if (codec_tag != NULL && codec_name != NULL) { if (stream->pending_tags == NULL) - stream->pending_tags = gst_tag_list_new (); + stream->pending_tags = gst_tag_list_new_empty (); gst_tag_list_add (stream->pending_tags, GST_TAG_MERGE_KEEP, codec_tag, codec_name, NULL); g_free (codec_name); @@ -1596,13 +1596,13 @@ gst_rmdemux_parse_mdpr (GstRMDemux * rmdemux, const guint8 * data, int length) GST_LOG_OBJECT (rmdemux, "Stream avg bitrate=%u", avg_bitrate); if (max_bitrate != 0) { if (stream->pending_tags == NULL) - stream->pending_tags = gst_tag_list_new (); + stream->pending_tags = gst_tag_list_new_empty (); gst_tag_list_add (stream->pending_tags, GST_TAG_MERGE_REPLACE, GST_TAG_MAXIMUM_BITRATE, max_bitrate, NULL); } if (avg_bitrate != 0) { if (stream->pending_tags == NULL) - stream->pending_tags = gst_tag_list_new (); + stream->pending_tags = gst_tag_list_new_empty (); gst_tag_list_add (stream->pending_tags, GST_TAG_MERGE_REPLACE, GST_TAG_BITRATE, avg_bitrate, NULL); } @@ -2624,15 +2624,15 @@ gst_rmdemux_parse_packet (GstRMDemux * rmdemux, GstBuffer * in, guint16 version) rmdemux->need_newsegment = FALSE; if (rmdemux->pending_tags != NULL) { - gst_element_found_tags (GST_ELEMENT (rmdemux), rmdemux->pending_tags); + gst_rmdemux_send_event (rmdemux, + gst_event_new_tag (rmdemux->pending_tags)); rmdemux->pending_tags = NULL; } } if (stream->pending_tags != NULL) { GST_LOG_OBJECT (stream->pad, "tags %" GST_PTR_FORMAT, stream->pending_tags); - gst_element_found_tags_for_pad (GST_ELEMENT_CAST (rmdemux), stream->pad, - stream->pending_tags); + gst_pad_push_event (stream->pad, gst_event_new_tag (stream->pending_tags)); stream->pending_tags = NULL; } diff --git a/gst/realmedia/rmutils.c b/gst/realmedia/rmutils.c index 7c4a3412b6..3c77e24f34 100644 --- a/gst/realmedia/rmutils.c +++ b/gst/realmedia/rmutils.c @@ -82,7 +82,7 @@ gst_rm_utils_read_tags (const guint8 * data, guint datalen, GST_DEBUG ("File Content : (CONT) len = %d", datalen); - tags = gst_tag_list_new (); + tags = gst_tag_list_new_empty (); for (i = 0; i < G_N_ELEMENTS (gst_tags); ++i) { gchar *str = NULL;