From 06311362e9c4b03db08cbbdae1e5ec88f4cddf79 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 27 Oct 2011 17:26:58 +0200 Subject: [PATCH] fix compilation --- ext/alsa/gstalsa.c | 2 +- ext/ogg/gstoggaviparse.c | 2 +- ext/ogg/gstoggdemux.c | 2 +- ext/ogg/gstoggstream.c | 18 +++---- ext/ogg/gstogmparse.c | 2 +- ext/vorbis/gstvorbisenc.c | 2 +- gst-libs/gst/riff/riff-media.c | 102 +++++++++++++++++------------------ gst-libs/gst/rtp/gstbasertppayload.c | 2 +- gst/subparse/gstsubparse.c | 18 +++---- gst/typefind/gsttypefindfunctions.c | 4 +- 10 files changed, 77 insertions(+), 77 deletions(-) diff --git a/ext/alsa/gstalsa.c b/ext/alsa/gstalsa.c index 60f3f3e..bc3e92a 100644 --- a/ext/alsa/gstalsa.c +++ b/ext/alsa/gstalsa.c @@ -446,7 +446,7 @@ gst_alsa_probe_supported_formats (GstObject * obj, snd_pcm_t * handle, snd_pcm_t *pcm = gst_alsa_open_iec958_pcm (obj); if (G_LIKELY (pcm)) { - gst_caps_append (caps, gst_caps_new_simple ("audio/x-iec958", NULL)); + gst_caps_append (caps, gst_caps_new_empty_simple ("audio/x-iec958")); snd_pcm_close (pcm); } } diff --git a/ext/ogg/gstoggaviparse.c b/ext/ogg/gstoggaviparse.c index 3a2b892..50d4eb1 100644 --- a/ext/ogg/gstoggaviparse.c +++ b/ext/ogg/gstoggaviparse.c @@ -250,7 +250,7 @@ gst_ogg_avi_parse_setcaps (GstPad * pad, GstCaps * caps) goto buffer_too_small; /* set caps */ - outcaps = gst_caps_new_simple ("audio/x-vorbis", NULL); + outcaps = gst_caps_new_empty_simple ("audio/x-vorbis"); gst_pad_push_event (ogg->srcpad, gst_event_new_caps (outcaps)); gst_caps_unref (outcaps); diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 74703c5..117f1ec 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -789,7 +789,7 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet) if (!pad->have_type) { pad->have_type = gst_ogg_stream_setup_map (&pad->map, packet); if (!pad->have_type) { - pad->map.caps = gst_caps_new_simple ("application/x-unknown", NULL); + pad->map.caps = gst_caps_new_empty_simple ("application/x-unknown"); } if (pad->map.is_skeleton) { GST_DEBUG_OBJECT (ogg, "we have a fishead"); diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c index e20c568..f43847a 100644 --- a/ext/ogg/gstoggstream.c +++ b/ext/ogg/gstoggstream.c @@ -398,7 +398,7 @@ setup_theora_mapper (GstOggStream * pad, ogg_packet * packet) pad->theora_has_zero_keyoffset = ((vmaj << 16) | (vmin << 8) | vrev) < 0x030201; - pad->caps = gst_caps_new_simple ("video/x-theora", NULL); + pad->caps = gst_caps_new_empty_simple ("video/x-theora"); if (w > 0 && h > 0) { gst_caps_set_simple (pad->caps, "width", G_TYPE_INT, w, "height", @@ -886,7 +886,7 @@ setup_fLaC_mapper (GstOggStream * pad, ogg_packet * packet) pad->n_header_packets = 3; - pad->caps = gst_caps_new_simple ("audio/x-flac", NULL); + pad->caps = gst_caps_new_empty_simple ("audio/x-flac"); return TRUE; } @@ -1092,7 +1092,7 @@ setup_fishead_mapper (GstOggStream * pad, ogg_packet * packet) pad->is_skeleton = TRUE; pad->is_sparse = TRUE; - pad->caps = gst_caps_new_simple ("application/x-ogg-skeleton", NULL); + pad->caps = gst_caps_new_empty_simple ("application/x-ogg-skeleton"); return TRUE; } @@ -1537,7 +1537,7 @@ setup_ogmtext_mapper (GstOggStream * pad, ogg_packet * packet) if (pad->granulerate_d <= 0) return FALSE; - pad->caps = gst_caps_new_simple ("text/plain", NULL); + pad->caps = gst_caps_new_empty_simple ("text/plain"); pad->n_header_packets = 1; pad->is_ogm = TRUE; @@ -1621,10 +1621,10 @@ setup_pcm_mapper (GstOggStream * pad, ogg_packet * packet) "format", G_TYPE_STRING, "S32BE", NULL); break; case OGGPCM_FMT_ULAW: - caps = gst_caps_new_simple ("audio/x-mulaw", NULL); + caps = gst_caps_new_empty_simple ("audio/x-mulaw"); break; case OGGPCM_FMT_ALAW: - caps = gst_caps_new_simple ("audio/x-alaw", NULL); + caps = gst_caps_new_empty_simple ("audio/x-alaw"); break; case OGGPCM_FMT_FLT32_LE: caps = gst_caps_new_simple ("audio/x-raw", @@ -1675,7 +1675,7 @@ setup_cmml_mapper (GstOggStream * pad, ogg_packet * packet) GST_DEBUG ("blocksize0: %u", 1 << (data[0] >> 4)); GST_DEBUG ("blocksize1: %u", 1 << (data[0] & 0x0F)); - pad->caps = gst_caps_new_simple ("text/x-cmml", NULL); + pad->caps = gst_caps_new_empty_simple ("text/x-cmml"); pad->always_flush_page = TRUE; pad->is_sparse = TRUE; @@ -1732,9 +1732,9 @@ setup_kate_mapper (GstOggStream * pad, ogg_packet * packet) if (strcmp (category, "subtitles") == 0 || strcmp (category, "SUB") == 0 || strcmp (category, "spu-subtitles") == 0 || strcmp (category, "K-SPU") == 0) { - pad->caps = gst_caps_new_simple ("subtitle/x-kate", NULL); + pad->caps = gst_caps_new_empty_simple ("subtitle/x-kate"); } else { - pad->caps = gst_caps_new_simple ("application/x-kate", NULL); + pad->caps = gst_caps_new_empty_simple ("application/x-kate"); } pad->is_sparse = TRUE; diff --git a/ext/ogg/gstogmparse.c b/ext/ogg/gstogmparse.c index b81856a..5e6b8ef 100644 --- a/ext/ogg/gstogmparse.c +++ b/ext/ogg/gstogmparse.c @@ -614,7 +614,7 @@ gst_ogm_parse_stream_header (GstOgmParse * ogm, const guint8 * data, guint size) GST_LOG_OBJECT (ogm, "Type: %s, s/u: %" G_GINT64_FORMAT ", timeunit=%" G_GINT64_FORMAT, ogm->hdr.streamtype, ogm->hdr.samples_per_unit, ogm->hdr.time_unit); - caps = gst_caps_new_simple ("text/plain", NULL); + caps = gst_caps_new_empty_simple ("text/plain"); break; } default: diff --git a/ext/vorbis/gstvorbisenc.c b/ext/vorbis/gstvorbisenc.c index fd5f980..3ea4b6d 100644 --- a/ext/vorbis/gstvorbisenc.c +++ b/ext/vorbis/gstvorbisenc.c @@ -719,7 +719,7 @@ gst_vorbis_enc_handle_frame (GstAudioEncoder * enc, GstBuffer * buffer) buf3 = gst_vorbis_enc_buffer_from_header_packet (vorbisenc, &header_code); /* mark and put on caps */ - caps = gst_caps_new_simple ("audio/x-vorbis", NULL); + caps = gst_caps_new_empty_simple ("audio/x-vorbis"); caps = _gst_caps_set_buffer_array (caps, "streamheader", buf1, buf2, buf3, NULL); diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 90e7392..8fdc695 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -141,45 +141,45 @@ gst_riff_create_video_caps (guint32 codec_fcc, case GST_MAKE_FOURCC ('d', 'm', 'b', '1'): case GST_MAKE_FOURCC ('A', 'C', 'D', 'V'): case GST_MAKE_FOURCC ('Q', 'I', 'V', 'G'): - caps = gst_caps_new_simple ("image/jpeg", NULL); + caps = gst_caps_new_empty_simple ("image/jpeg"); if (codec_name) *codec_name = g_strdup ("Motion JPEG"); break; case GST_MAKE_FOURCC ('J', 'P', 'E', 'G'): /* generic (mostly RGB) MJPEG */ case GST_MAKE_FOURCC ('j', 'p', 'e', 'g'): /* generic (mostly RGB) MJPEG */ - caps = gst_caps_new_simple ("image/jpeg", NULL); + caps = gst_caps_new_empty_simple ("image/jpeg"); if (codec_name) *codec_name = g_strdup ("JPEG Still Image"); break; case GST_MAKE_FOURCC ('P', 'I', 'X', 'L'): /* Miro/Pinnacle fourccs */ case GST_MAKE_FOURCC ('V', 'I', 'X', 'L'): /* Miro/Pinnacle fourccs */ - caps = gst_caps_new_simple ("image/jpeg", NULL); + caps = gst_caps_new_empty_simple ("image/jpeg"); if (codec_name) *codec_name = g_strdup ("Miro/Pinnacle Motion JPEG"); break; case GST_MAKE_FOURCC ('C', 'J', 'P', 'G'): - caps = gst_caps_new_simple ("image/jpeg", NULL); + caps = gst_caps_new_empty_simple ("image/jpeg"); if (codec_name) *codec_name = g_strdup ("Creative Webcam JPEG"); break; case GST_MAKE_FOURCC ('S', 'L', 'M', 'J'): - caps = gst_caps_new_simple ("image/jpeg", NULL); + caps = gst_caps_new_empty_simple ("image/jpeg"); if (codec_name) *codec_name = g_strdup ("SL Motion JPEG"); break; case GST_MAKE_FOURCC ('J', 'P', 'G', 'L'): - caps = gst_caps_new_simple ("image/jpeg", NULL); + caps = gst_caps_new_empty_simple ("image/jpeg"); if (codec_name) *codec_name = g_strdup ("Pegasus Lossless JPEG"); break; case GST_MAKE_FOURCC ('L', 'O', 'C', 'O'): - caps = gst_caps_new_simple ("video/x-loco", NULL); + caps = gst_caps_new_empty_simple ("video/x-loco"); if (codec_name) *codec_name = g_strdup ("LOCO Lossless"); break; @@ -190,19 +190,19 @@ gst_riff_create_video_caps (guint32 codec_fcc, case GST_MAKE_FOURCC ('S', 'P', '5', '6'): case GST_MAKE_FOURCC ('S', 'P', '5', '7'): case GST_MAKE_FOURCC ('S', 'P', '5', '8'): - caps = gst_caps_new_simple ("video/sp5x", NULL); + caps = gst_caps_new_empty_simple ("video/sp5x"); if (codec_name) *codec_name = g_strdup ("Sp5x-like JPEG"); break; case GST_MAKE_FOURCC ('Z', 'M', 'B', 'V'): - caps = gst_caps_new_simple ("video/x-zmbv", NULL); + caps = gst_caps_new_empty_simple ("video/x-zmbv"); if (codec_name) *codec_name = g_strdup ("Zip Motion Block video"); break; case GST_MAKE_FOURCC ('H', 'F', 'Y', 'U'): - caps = gst_caps_new_simple ("video/x-huffyuv", NULL); + caps = gst_caps_new_empty_simple ("video/x-huffyuv"); if (strf) { gst_caps_set_simple (caps, "bpp", G_TYPE_INT, (int) strf->bit_cnt, NULL); @@ -396,13 +396,13 @@ gst_riff_create_video_caps (guint32 codec_fcc, case GST_MAKE_FOURCC ('X', 'V', 'I', 'D'): case GST_MAKE_FOURCC ('x', 'v', 'i', 'd'): - caps = gst_caps_new_simple ("video/x-xvid", NULL); + caps = gst_caps_new_empty_simple ("video/x-xvid"); if (codec_name) *codec_name = g_strdup ("XVID MPEG-4"); break; case GST_MAKE_FOURCC ('R', 'M', 'P', '4'): - caps = gst_caps_new_simple ("video/x-xvid", NULL); + caps = gst_caps_new_empty_simple ("video/x-xvid"); if (codec_name) *codec_name = g_strdup ("Sigma-Designs MPEG-4"); break; @@ -481,7 +481,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, case GST_MAKE_FOURCC ('3', 'I', 'V', '1'): case GST_MAKE_FOURCC ('3', 'I', 'V', '2'): - caps = gst_caps_new_simple ("video/x-3ivx", NULL); + caps = gst_caps_new_empty_simple ("video/x-3ivx"); if (codec_name) *codec_name = g_strdup ("3ivx"); break; @@ -551,7 +551,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, break; case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'): - caps = gst_caps_new_simple ("video/x-cinepak", NULL); + caps = gst_caps_new_empty_simple ("video/x-cinepak"); if (codec_name) *codec_name = g_strdup ("Cinepak video"); break; @@ -589,7 +589,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, break; case GST_MAKE_FOURCC ('A', 'A', 'S', 'C'): - caps = gst_caps_new_simple ("video/x-aasc", NULL); + caps = gst_caps_new_empty_simple ("video/x-aasc"); if (codec_name) *codec_name = g_strdup ("Autodesk Animator"); break; @@ -634,27 +634,27 @@ gst_riff_create_video_caps (guint32 codec_fcc, break; case GST_MAKE_FOURCC ('M', 'S', 'Z', 'H'): - caps = gst_caps_new_simple ("video/x-mszh", NULL); + caps = gst_caps_new_empty_simple ("video/x-mszh"); if (codec_name) *codec_name = g_strdup ("Lossless MSZH Video"); break; case GST_MAKE_FOURCC ('Z', 'L', 'I', 'B'): - caps = gst_caps_new_simple ("video/x-zlib", NULL); + caps = gst_caps_new_empty_simple ("video/x-zlib"); if (codec_name) *codec_name = g_strdup ("Lossless zlib video"); break; case GST_MAKE_FOURCC ('C', 'L', 'J', 'R'): case GST_MAKE_FOURCC ('c', 'l', 'j', 'r'): - caps = gst_caps_new_simple ("video/x-cirrus-logic-accupak", NULL); + caps = gst_caps_new_empty_simple ("video/x-cirrus-logic-accupak"); if (codec_name) *codec_name = g_strdup ("Cirrus Logipak AccuPak"); break; case GST_MAKE_FOURCC ('C', 'Y', 'U', 'V'): case GST_MAKE_FOURCC ('c', 'y', 'u', 'v'): - caps = gst_caps_new_simple ("video/x-compressed-yuv", NULL); + caps = gst_caps_new_empty_simple ("video/x-compressed-yuv"); if (codec_name) *codec_name = g_strdup ("CYUV Lossless"); break; @@ -679,13 +679,13 @@ gst_riff_create_video_caps (guint32 codec_fcc, case GST_MAKE_FOURCC ('V', 'P', '3', '1'): case GST_MAKE_FOURCC ('v', 'p', '3', '1'): case GST_MAKE_FOURCC ('V', 'P', '3', ' '): - caps = gst_caps_new_simple ("video/x-vp3", NULL); + caps = gst_caps_new_empty_simple ("video/x-vp3"); if (codec_name) *codec_name = g_strdup ("VP3"); break; case GST_MAKE_FOURCC ('U', 'L', 'T', 'I'): - caps = gst_caps_new_simple ("video/x-ultimotion", NULL); + caps = gst_caps_new_empty_simple ("video/x-ultimotion"); if (codec_name) *codec_name = g_strdup ("IBM UltiMotion"); break; @@ -699,7 +699,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, depth, NULL); } else { /* template caps */ - caps = gst_caps_new_simple ("video/x-camtasia", NULL); + caps = gst_caps_new_empty_simple ("video/x-camtasia"); } if (codec_name) *codec_name = g_strdup ("TechSmith Camtasia"); @@ -715,7 +715,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, depth, NULL); } else { /* template caps */ - caps = gst_caps_new_simple ("video/x-camstudio", NULL); + caps = gst_caps_new_empty_simple ("video/x-camstudio"); } if (codec_name) *codec_name = g_strdup ("Camstudio"); @@ -753,7 +753,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, case GST_MAKE_FOURCC ('M', 'P', 'N', 'G'): case GST_MAKE_FOURCC ('m', 'p', 'n', 'g'): case GST_MAKE_FOURCC ('P', 'N', 'G', ' '): - caps = gst_caps_new_simple ("image/png", NULL); + caps = gst_caps_new_empty_simple ("image/png"); if (codec_name) *codec_name = g_strdup ("PNG image"); break; @@ -773,7 +773,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, break; case GST_MAKE_FOURCC ('d', 'r', 'a', 'c'): - caps = gst_caps_new_simple ("video/x-dirac", NULL); + caps = gst_caps_new_empty_simple ("video/x-dirac"); if (codec_name) *codec_name = g_strdup ("Dirac"); break; @@ -781,7 +781,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, case GST_RIFF_rpza: case GST_RIFF_azpr: case GST_MAKE_FOURCC ('R', 'P', 'Z', 'A'): - caps = gst_caps_new_simple ("video/x-apple-video", NULL); + caps = gst_caps_new_empty_simple ("video/x-apple-video"); if (codec_name) *codec_name = g_strdup ("Apple Video (RPZA)"); break; @@ -795,14 +795,14 @@ gst_riff_create_video_caps (guint32 codec_fcc, break; case GST_MAKE_FOURCC ('K', 'M', 'V', 'C'): - caps = gst_caps_new_simple ("video/x-kmvc", NULL); + caps = gst_caps_new_empty_simple ("video/x-kmvc"); if (codec_name) *codec_name = g_strdup ("Karl Morton's video codec"); break; case GST_MAKE_FOURCC ('v', 'p', '5', '0'): case GST_MAKE_FOURCC ('V', 'P', '5', '0'): - caps = gst_caps_new_simple ("video/x-vp5", NULL); + caps = gst_caps_new_empty_simple ("video/x-vp5"); if (codec_name) *codec_name = g_strdup ("On2 VP5"); break; @@ -813,7 +813,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, case GST_MAKE_FOURCC ('V', 'P', '6', '1'): case GST_MAKE_FOURCC ('V', 'p', '6', '2'): case GST_MAKE_FOURCC ('V', 'P', '6', '2'): - caps = gst_caps_new_simple ("video/x-vp6", NULL); + caps = gst_caps_new_empty_simple ("video/x-vp6"); if (codec_name) *codec_name = g_strdup ("On2 VP6"); break; @@ -821,40 +821,40 @@ gst_riff_create_video_caps (guint32 codec_fcc, case GST_MAKE_FOURCC ('V', 'P', '6', 'F'): case GST_MAKE_FOURCC ('v', 'p', '6', 'f'): case GST_MAKE_FOURCC ('F', 'L', 'V', '4'): - caps = gst_caps_new_simple ("video/x-vp6-flash", NULL); + caps = gst_caps_new_empty_simple ("video/x-vp6-flash"); if (codec_name) *codec_name = g_strdup ("On2 VP6"); break; case GST_MAKE_FOURCC ('v', 'p', '7', '0'): case GST_MAKE_FOURCC ('V', 'P', '7', '0'): - caps = gst_caps_new_simple ("video/x-vp7", NULL); + caps = gst_caps_new_empty_simple ("video/x-vp7"); if (codec_name) *codec_name = g_strdup ("On2 VP7"); break; case GST_MAKE_FOURCC ('V', 'P', '8', '0'): - caps = gst_caps_new_simple ("video/x-vp8", NULL); + caps = gst_caps_new_empty_simple ("video/x-vp8"); if (codec_name) *codec_name = g_strdup ("On2 VP8"); break; case GST_MAKE_FOURCC ('L', 'M', '2', '0'): - caps = gst_caps_new_simple ("video/x-mimic", NULL); + caps = gst_caps_new_empty_simple ("video/x-mimic"); if (codec_name) *codec_name = g_strdup ("Mimic webcam"); break; case GST_MAKE_FOURCC ('T', 'H', 'E', 'O'): case GST_MAKE_FOURCC ('t', 'h', 'e', 'o'): - caps = gst_caps_new_simple ("video/x-theora", NULL); + caps = gst_caps_new_empty_simple ("video/x-theora"); if (codec_name) *codec_name = g_strdup ("Theora video codec"); break; case GST_MAKE_FOURCC ('F', 'P', 'S', '1'): - caps = gst_caps_new_simple ("video/x-fraps", NULL); + caps = gst_caps_new_empty_simple ("video/x-fraps"); if (codec_name) *codec_name = g_strdup ("Fraps video"); @@ -1229,13 +1229,13 @@ gst_riff_create_audio_caps (guint16 codec_id, } } rate_max = 48000; - caps = gst_caps_new_simple ("audio/x-alaw", NULL); + caps = gst_caps_new_empty_simple ("audio/x-alaw"); if (codec_name) *codec_name = g_strdup ("A-law audio"); break; case GST_RIFF_WAVE_FORMAT_WMS: - caps = gst_caps_new_simple ("audio/x-wms", NULL); + caps = gst_caps_new_empty_simple ("audio/x-wms"); if (strf != NULL) { gst_caps_set_simple (caps, "bitrate", G_TYPE_INT, strf->av_bps * 8, @@ -1267,7 +1267,7 @@ gst_riff_create_audio_caps (guint16 codec_id, } } rate_max = 48000; - caps = gst_caps_new_simple ("audio/x-mulaw", NULL); + caps = gst_caps_new_empty_simple ("audio/x-mulaw"); if (codec_name) *codec_name = g_strdup ("Mu-law audio"); break; @@ -1287,7 +1287,7 @@ gst_riff_create_audio_caps (guint16 codec_id, case GST_RIFF_WAVE_FORMAT_DSP_TRUESPEECH: rate_min = 8000; rate_max = 8000; - caps = gst_caps_new_simple ("audio/x-truespeech", NULL); + caps = gst_caps_new_empty_simple ("audio/x-truespeech"); if (codec_name) *codec_name = g_strdup ("DSP Group TrueSpeech"); break; @@ -1295,7 +1295,7 @@ gst_riff_create_audio_caps (guint16 codec_id, case GST_RIFF_WAVE_FORMAT_GSM610: case GST_RIFF_WAVE_FORMAT_MSN: rate_min = 1; - caps = gst_caps_new_simple ("audio/ms-gsm", NULL); + caps = gst_caps_new_empty_simple ("audio/ms-gsm"); if (codec_name) *codec_name = g_strdup ("MS GSM audio"); break; @@ -1322,7 +1322,7 @@ gst_riff_create_audio_caps (guint16 codec_id, rate_min = 8000; rate_max = 8000; channels_max = 1; - caps = gst_caps_new_simple ("audio/AMR", NULL); + caps = gst_caps_new_empty_simple ("audio/AMR"); if (codec_name) *codec_name = g_strdup ("AMR Narrow Band (NB)"); break; @@ -1331,7 +1331,7 @@ gst_riff_create_audio_caps (guint16 codec_id, rate_min = 16000; rate_max = 16000; channels_max = 1; - caps = gst_caps_new_simple ("audio/AMR-WB", NULL); + caps = gst_caps_new_empty_simple ("audio/AMR-WB"); if (codec_name) *codec_name = g_strdup ("AMR Wide Band (WB)"); break; @@ -1343,20 +1343,20 @@ gst_riff_create_audio_caps (guint16 codec_id, case GST_RIFF_WAVE_FORMAT_VORBIS2PLUS: /* ogg/vorbis mode 2+ */ case GST_RIFF_WAVE_FORMAT_VORBIS3PLUS: /* ogg/vorbis mode 3+ */ rate_max = 192000; - caps = gst_caps_new_simple ("audio/x-vorbis", NULL); + caps = gst_caps_new_empty_simple ("audio/x-vorbis"); if (codec_name) *codec_name = g_strdup ("Vorbis"); break; case GST_RIFF_WAVE_FORMAT_A52: channels_max = 6; - caps = gst_caps_new_simple ("audio/x-ac3", NULL); + caps = gst_caps_new_empty_simple ("audio/x-ac3"); if (codec_name) *codec_name = g_strdup ("AC-3 audio"); break; case GST_RIFF_WAVE_FORMAT_DTS: channels_max = 6; - caps = gst_caps_new_simple ("audio/x-dts", NULL); + caps = gst_caps_new_empty_simple ("audio/x-dts"); if (codec_name) *codec_name = g_strdup ("DTS audio"); /* wavparse is not always able to specify rate/channels for DTS-in-wav */ @@ -1404,13 +1404,13 @@ gst_riff_create_audio_caps (guint16 codec_id, break; } case GST_RIFF_WAVE_FORMAT_SONY_ATRAC3: - caps = gst_caps_new_simple ("audio/x-vnd.sony.atrac3", NULL); + caps = gst_caps_new_empty_simple ("audio/x-vnd.sony.atrac3"); if (codec_name) *codec_name = g_strdup ("Sony ATRAC3"); break; case GST_RIFF_WAVE_FORMAT_SIREN: - caps = gst_caps_new_simple ("audio/x-siren", NULL); + caps = gst_caps_new_empty_simple ("audio/x-siren"); if (codec_name) *codec_name = g_strdup ("Siren7"); rate_chan = FALSE; @@ -1581,7 +1581,7 @@ gst_riff_create_audio_caps (guint16 codec_id, } } rate_max = 48000; - caps = gst_caps_new_simple ("audio/x-alaw", NULL); + caps = gst_caps_new_empty_simple ("audio/x-alaw"); if (codec_name) *codec_name = g_strdup ("A-law audio"); @@ -1604,7 +1604,7 @@ gst_riff_create_audio_caps (guint16 codec_id, } } rate_max = 48000; - caps = gst_caps_new_simple ("audio/x-mulaw", NULL); + caps = gst_caps_new_empty_simple ("audio/x-mulaw"); if (codec_name) *codec_name = g_strdup ("Mu-law audio"); } else if (subformat_guid[0] == 0x00000092) { @@ -1613,7 +1613,7 @@ gst_riff_create_audio_caps (guint16 codec_id, } else if (subformat_guid[0] == 0x6ba47966 && subformat_guid[1] == 0x41783f83 && subformat_guid[2] == 0xf0006596 && subformat_guid[3] == 0xe59262bf) { - caps = gst_caps_new_simple ("application/x-ogg-avi", NULL); + caps = gst_caps_new_empty_simple ("application/x-ogg-avi"); if (codec_name) *codec_name = g_strdup ("Ogg-AVI"); } @@ -1874,7 +1874,7 @@ gst_riff_create_audio_template_caps (void) if (one) gst_caps_append (caps, one); } - one = gst_caps_new_simple ("application/x-ogg-avi", NULL); + one = gst_caps_new_empty_simple ("application/x-ogg-avi"); gst_caps_append (caps, one); return caps; diff --git a/gst-libs/gst/rtp/gstbasertppayload.c b/gst-libs/gst/rtp/gstbasertppayload.c index 3bca852..4dbe70b 100644 --- a/gst-libs/gst/rtp/gstbasertppayload.c +++ b/gst-libs/gst/rtp/gstbasertppayload.c @@ -657,7 +657,7 @@ gst_basertppayload_set_outcaps (GstBaseRTPPayload * payload, /* make the target caps by copying over all the fixed caps, removing the * unfixed caps. */ - srccaps = gst_caps_new_simple (gst_structure_get_name (s), NULL); + srccaps = gst_caps_new_empty_simple (gst_structure_get_name (s)); d = gst_caps_get_structure (srccaps, 0); gst_structure_foreach (s, (GstStructureForeachFunc) copy_fixed, d); diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c index 386c527..88e3f7f 100644 --- a/gst/subparse/gstsubparse.c +++ b/gst/subparse/gstsubparse.c @@ -1339,36 +1339,36 @@ gst_sub_parse_format_autodetect (GstSubParse * self) switch (format) { case GST_SUB_PARSE_FORMAT_MDVDSUB: self->parse_line = parse_mdvdsub; - return gst_caps_new_simple ("text/x-pango-markup", NULL); + return gst_caps_new_empty_simple ("text/x-pango-markup"); case GST_SUB_PARSE_FORMAT_SUBRIP: self->parse_line = parse_subrip; - return gst_caps_new_simple ("text/x-pango-markup", NULL); + return gst_caps_new_empty_simple ("text/x-pango-markup"); case GST_SUB_PARSE_FORMAT_MPSUB: self->parse_line = parse_mpsub; - return gst_caps_new_simple ("text/plain", NULL); + return gst_caps_new_empty_simple ("text/plain"); #ifndef GST_DISABLE_XML case GST_SUB_PARSE_FORMAT_SAMI: self->parse_line = parse_sami; sami_context_init (&self->state); - return gst_caps_new_simple ("text/x-pango-markup", NULL); + return gst_caps_new_empty_simple ("text/x-pango-markup"); #endif case GST_SUB_PARSE_FORMAT_TMPLAYER: self->parse_line = parse_tmplayer; self->state.max_duration = 5 * GST_SECOND; - return gst_caps_new_simple ("text/plain", NULL); + return gst_caps_new_empty_simple ("text/plain"); case GST_SUB_PARSE_FORMAT_MPL2: self->parse_line = parse_mpl2; - return gst_caps_new_simple ("text/x-pango-markup", NULL); + return gst_caps_new_empty_simple ("text/x-pango-markup"); case GST_SUB_PARSE_FORMAT_DKS: self->parse_line = parse_dks; - return gst_caps_new_simple ("text/plain", NULL); + return gst_caps_new_empty_simple ("text/plain"); case GST_SUB_PARSE_FORMAT_SUBVIEWER: self->parse_line = parse_subviewer; - return gst_caps_new_simple ("text/plain", NULL); + return gst_caps_new_empty_simple ("text/plain"); case GST_SUB_PARSE_FORMAT_QTTEXT: self->parse_line = parse_qttext; qttext_context_init (&self->state); - return gst_caps_new_simple ("text/x-pango-markup", NULL); + return gst_caps_new_empty_simple ("text/x-pango-markup"); case GST_SUB_PARSE_FORMAT_UNKNOWN: default: GST_DEBUG ("no subtitle format detected"); diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c index 2e2a567..b39724a 100644 --- a/gst/typefind/gsttypefindfunctions.c +++ b/gst/typefind/gsttypefindfunctions.c @@ -4170,7 +4170,7 @@ G_BEGIN_DECLS{ \ sw_data->data = (const guint8 *)_data; \ sw_data->size = _size; \ sw_data->probability = _probability; \ - sw_data->caps = gst_caps_new_simple (name, NULL); \ + sw_data->caps = gst_caps_new_empty_simple (name); \ if (!gst_type_find_register (plugin, name, rank, start_with_type_find,\ (char **) ext, sw_data->caps, sw_data, \ (GDestroyNotify) (sw_data_destroy))) { \ @@ -4200,7 +4200,7 @@ G_BEGIN_DECLS{ \ sw_data->data = (gpointer)_data; \ sw_data->size = 4; \ sw_data->probability = GST_TYPE_FIND_MAXIMUM; \ - sw_data->caps = gst_caps_new_simple (name, NULL); \ + sw_data->caps = gst_caps_new_empty_simple (name); \ if (!gst_type_find_register (plugin, name, rank, riff_type_find, \ (char **) ext, sw_data->caps, sw_data, \ (GDestroyNotify) (sw_data_destroy))) { \ -- 2.7.4