make some more things compile again

This commit is contained in:
Wim Taymans 2011-10-27 19:00:52 +02:00
parent 4b6a226263
commit 9c14280b1d
13 changed files with 24 additions and 25 deletions

View File

@ -172,7 +172,7 @@ gst_aac_parse_set_src_caps (GstAacParse * aacparse, GstCaps * sink_caps)
if (sink_caps) if (sink_caps)
src_caps = gst_caps_copy (sink_caps); src_caps = gst_caps_copy (sink_caps);
else else
src_caps = gst_caps_new_simple ("audio/mpeg", NULL); src_caps = gst_caps_new_empty_simple ("audio/mpeg");
gst_caps_set_simple (src_caps, "framed", G_TYPE_BOOLEAN, TRUE, gst_caps_set_simple (src_caps, "framed", G_TYPE_BOOLEAN, TRUE,
"mpegversion", G_TYPE_INT, aacparse->mpegversion, NULL); "mpegversion", G_TYPE_INT, aacparse->mpegversion, NULL);

View File

@ -139,17 +139,17 @@ gst_avi_demux_class_init (GstAviDemuxClass * klass)
gstelement_class->get_index = GST_DEBUG_FUNCPTR (gst_avi_demux_get_index); gstelement_class->get_index = GST_DEBUG_FUNCPTR (gst_avi_demux_get_index);
audcaps = gst_riff_create_audio_template_caps (); audcaps = gst_riff_create_audio_template_caps ();
gst_caps_append (audcaps, gst_caps_new_simple ("audio/x-avi-unknown", NULL)); gst_caps_append (audcaps, gst_caps_new_empty_simple ("audio/x-avi-unknown"));
audiosrctempl = gst_pad_template_new ("audio_%02d", audiosrctempl = gst_pad_template_new ("audio_%02d",
GST_PAD_SRC, GST_PAD_SOMETIMES, audcaps); GST_PAD_SRC, GST_PAD_SOMETIMES, audcaps);
vidcaps = gst_riff_create_video_template_caps (); vidcaps = gst_riff_create_video_template_caps ();
gst_caps_append (vidcaps, gst_riff_create_iavs_template_caps ()); gst_caps_append (vidcaps, gst_riff_create_iavs_template_caps ());
gst_caps_append (vidcaps, gst_caps_new_simple ("video/x-avi-unknown", NULL)); gst_caps_append (vidcaps, gst_caps_new_empty_simple ("video/x-avi-unknown"));
videosrctempl = gst_pad_template_new ("video_%02d", videosrctempl = gst_pad_template_new ("video_%02d",
GST_PAD_SRC, GST_PAD_SOMETIMES, vidcaps); GST_PAD_SRC, GST_PAD_SOMETIMES, vidcaps);
subcaps = gst_caps_new_simple ("application/x-subtitle-avi", NULL); subcaps = gst_caps_new_empty_simple ("application/x-subtitle-avi");
subsrctempl = gst_pad_template_new ("subtitle_%02d", subsrctempl = gst_pad_template_new ("subtitle_%02d",
GST_PAD_SRC, GST_PAD_SOMETIMES, subcaps); GST_PAD_SRC, GST_PAD_SOMETIMES, subcaps);
gst_element_class_add_pad_template (gstelement_class, audiosrctempl); gst_element_class_add_pad_template (gstelement_class, audiosrctempl);
@ -2221,7 +2221,7 @@ gst_avi_demux_parse_stream (GstAviDemux * avi, GstBuffer * buf)
case GST_RIFF_FCC_txts:{ case GST_RIFF_FCC_txts:{
padname = g_strdup_printf ("subtitle_%02d", avi->num_t_streams); padname = g_strdup_printf ("subtitle_%02d", avi->num_t_streams);
templ = gst_element_class_get_pad_template (klass, "subtitle_%02d"); templ = gst_element_class_get_pad_template (klass, "subtitle_%02d");
caps = gst_caps_new_simple ("application/x-subtitle-avi", NULL); caps = gst_caps_new_empty_simple ("application/x-subtitle-avi");
tag_name = NULL; tag_name = NULL;
avi->num_t_streams++; avi->num_t_streams++;
break; break;

View File

@ -659,7 +659,7 @@ gst_flv_demux_audio_negotiate (GstFlvDemux * demux, guint32 codec_tag,
case 4: case 4:
case 5: case 5:
case 6: case 6:
caps = gst_caps_new_simple ("audio/x-nellymoser", NULL); caps = gst_caps_new_empty_simple ("audio/x-nellymoser");
break; break;
case 10: case 10:
{ {
@ -693,13 +693,13 @@ gst_flv_demux_audio_negotiate (GstFlvDemux * demux, guint32 codec_tag,
break; break;
} }
case 7: case 7:
caps = gst_caps_new_simple ("audio/x-alaw", NULL); caps = gst_caps_new_empty_simple ("audio/x-alaw");
break; break;
case 8: case 8:
caps = gst_caps_new_simple ("audio/x-mulaw", NULL); caps = gst_caps_new_empty_simple ("audio/x-mulaw");
break; break;
case 11: case 11:
caps = gst_caps_new_simple ("audio/x-speex", NULL); caps = gst_caps_new_empty_simple ("audio/x-speex");
break; break;
default: default:
GST_WARNING_OBJECT (demux, "unsupported audio codec tag %u", codec_tag); GST_WARNING_OBJECT (demux, "unsupported audio codec tag %u", codec_tag);
@ -1075,16 +1075,16 @@ gst_flv_demux_video_negotiate (GstFlvDemux * demux, guint32 codec_tag)
/* Generate caps for that pad */ /* Generate caps for that pad */
switch (codec_tag) { switch (codec_tag) {
case 2: case 2:
caps = gst_caps_new_simple ("video/x-flash-video", NULL); caps = gst_caps_new_empty_simple ("video/x-flash-video");
break; break;
case 3: case 3:
caps = gst_caps_new_simple ("video/x-flash-screen", NULL); caps = gst_caps_new_empty_simple ("video/x-flash-screen");
break; break;
case 4: case 4:
caps = gst_caps_new_simple ("video/x-vp6-flash", NULL); caps = gst_caps_new_empty_simple ("video/x-vp6-flash");
break; break;
case 5: case 5:
caps = gst_caps_new_simple ("video/x-vp6-alpha", NULL); caps = gst_caps_new_empty_simple ("video/x-vp6-alpha");
break; break;
case 7: case 7:
caps = caps =

View File

@ -1172,8 +1172,7 @@ gst_flv_mux_write_header (GstFlvMux * mux)
gst_flv_mux_put_buffer_in_streamheader (&streamheader, audio_codec_data); gst_flv_mux_put_buffer_in_streamheader (&streamheader, audio_codec_data);
/* create the caps and put the streamheader in them */ /* create the caps and put the streamheader in them */
caps = gst_caps_new_simple ("video/x-flv", NULL); caps = gst_caps_new_empty_simple ("video/x-flv");
caps = gst_caps_make_writable (caps);
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
gst_structure_set_value (structure, "streamheader", &streamheader); gst_structure_set_value (structure, "streamheader", &streamheader);
g_value_unset (&streamheader); g_value_unset (&streamheader);

View File

@ -414,7 +414,7 @@ gst_icydemux_typefind_or_forward (GstICYDemux * icydemux, GstBuffer * buf)
if (G_UNLIKELY (icydemux->content_type)) { if (G_UNLIKELY (icydemux->content_type)) {
if (!g_ascii_strcasecmp (icydemux->content_type, "video/nsv")) { if (!g_ascii_strcasecmp (icydemux->content_type, "video/nsv")) {
GST_DEBUG ("We have a NSV stream"); GST_DEBUG ("We have a NSV stream");
caps = gst_caps_new_simple ("video/x-nsv", NULL); caps = gst_caps_new_empty_simple ("video/x-nsv");
} else { } else {
GST_DEBUG ("Upstream Content-Type isn't supported"); GST_DEBUG ("Upstream Content-Type isn't supported");
g_free (icydemux->content_type); g_free (icydemux->content_type);

View File

@ -37,11 +37,11 @@ The following fields can or must (*) be specified in the structure:
The ssrc value currently in use. (default = the SSRC of the first RTP The ssrc value currently in use. (default = the SSRC of the first RTP
packet) packet)
clock-base: (uint) [0 - MAXINT] timestamp-offset: (uint) [0 - MAXINT]
The RTP time representing time npt-start. (default = rtptime of first RTP The RTP time representing time npt-start. (default = rtptime of first RTP
packet). packet).
seqnum-base: (uint) [0 - MAXINT] seqnum-offset: (uint) [0 - MAXINT]
The RTP sequence number representing the first rtp packet. When this The RTP sequence number representing the first rtp packet. When this
parameter is given, all sequence numbers below this seqnum should be parameter is given, all sequence numbers below this seqnum should be
ignored. (default = seqnum of first RTP packet). ignored. (default = seqnum of first RTP packet).

View File

@ -100,7 +100,7 @@ gst_rtp_ac3_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
clock_rate = 90000; /* default */ clock_rate = 90000; /* default */
depayload->clock_rate = clock_rate; depayload->clock_rate = clock_rate;
srccaps = gst_caps_new_simple ("audio/ac3", NULL); srccaps = gst_caps_new_empty_simple ("audio/ac3");
res = gst_pad_set_caps (depayload->srcpad, srccaps); res = gst_pad_set_caps (depayload->srcpad, srccaps);
gst_caps_unref (srccaps); gst_caps_unref (srccaps);

View File

@ -171,7 +171,7 @@ gst_rtp_celt_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
GST_WRITE_UINT32_LE (ptr, 0); /* extra headers */ GST_WRITE_UINT32_LE (ptr, 0); /* extra headers */
gst_buffer_unmap (buf, data, size); gst_buffer_unmap (buf, data, size);
srccaps = gst_caps_new_simple ("audio/x-celt", NULL); srccaps = gst_caps_new_empty_simple ("audio/x-celt");
res = gst_pad_set_caps (depayload->srcpad, srccaps); res = gst_pad_set_caps (depayload->srcpad, srccaps);
gst_caps_unref (srccaps); gst_caps_unref (srccaps);

View File

@ -299,7 +299,7 @@ gst_rtp_h264_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
clock_rate = 90000; clock_rate = 90000;
depayload->clock_rate = clock_rate; depayload->clock_rate = clock_rate;
srccaps = gst_caps_new_simple ("video/x-h264", NULL); srccaps = gst_caps_new_empty_simple ("video/x-h264");
/* Base64 encoded, comma separated config NALs */ /* Base64 encoded, comma separated config NALs */
ps = gst_structure_get_string (structure, "sprop-parameter-sets"); ps = gst_structure_get_string (structure, "sprop-parameter-sets");

View File

@ -358,7 +358,7 @@ gst_rtp_h264_pay_getcaps (GstBaseRTPPayload * payload, GstPad * pad,
} }
any: any:
return gst_caps_new_simple ("video/x-h264", NULL); return gst_caps_new_empty_simple ("video/x-h264");
} }
/* take the currently configured SPS and PPS lists and set them on the caps as /* take the currently configured SPS and PPS lists and set them on the caps as

View File

@ -171,7 +171,7 @@ gst_rtp_speex_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
GST_WRITE_UINT32_LE (data, 0); /* reserved2 */ GST_WRITE_UINT32_LE (data, 0); /* reserved2 */
gst_buffer_unmap (buf, bdata, -1); gst_buffer_unmap (buf, bdata, -1);
srccaps = gst_caps_new_simple ("audio/x-speex", NULL); srccaps = gst_caps_new_empty_simple ("audio/x-speex");
res = gst_pad_set_caps (depayload->srcpad, srccaps); res = gst_pad_set_caps (depayload->srcpad, srccaps);
gst_caps_unref (srccaps); gst_caps_unref (srccaps);

View File

@ -339,7 +339,7 @@ gst_rtp_theora_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
} }
/* set caps on pad and on header */ /* set caps on pad and on header */
srccaps = gst_caps_new_simple ("video/x-theora", NULL); srccaps = gst_caps_new_empty_simple ("video/x-theora");
res = gst_pad_set_caps (depayload->srcpad, srccaps); res = gst_pad_set_caps (depayload->srcpad, srccaps);
gst_caps_unref (srccaps); gst_caps_unref (srccaps);

View File

@ -377,7 +377,7 @@ gst_rtp_vorbis_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
depayload->clock_rate = clock_rate; depayload->clock_rate = clock_rate;
/* set caps on pad and on header */ /* set caps on pad and on header */
srccaps = gst_caps_new_simple ("audio/x-vorbis", NULL); srccaps = gst_caps_new_empty_simple ("audio/x-vorbis");
res = gst_pad_set_caps (depayload->srcpad, srccaps); res = gst_pad_set_caps (depayload->srcpad, srccaps);
gst_caps_unref (srccaps); gst_caps_unref (srccaps);