diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2013-07-30 16:08:17 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2013-07-30 16:08:17 +0100 |
| commit | 646ba6b3df8f363723715f8bac2092c8fb07648d (patch) | |
| tree | 0f8e431dc01f8f894046e62cff72602ac65e6fe4 /gst | |
| parent | dd83d3f46c7eed77b297e8526b2c018f9ed9ce27 (diff) | |
| download | gstreamer-plugins-bad-646ba6b3df8f363723715f8bac2092c8fb07648d.tar.gz | |
mpegts: private/teletext -> application/x-teletext
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/mpegtsdemux/tsdemux.c | 2 | ||||
| -rw-r--r-- | gst/mpegtsmux/mpegtsmux.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c index d4f418d01..608927698 100644 --- a/gst/mpegtsdemux/tsdemux.c +++ b/gst/mpegtsdemux/tsdemux.c @@ -826,7 +826,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_empty_simple ("private/teletext"); + caps = gst_caps_new_empty_simple ("application/x-teletext"); break; } desc = diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c index e7a6d014c..a31157fc7 100644 --- a/gst/mpegtsmux/mpegtsmux.c +++ b/gst/mpegtsmux/mpegtsmux.c @@ -135,7 +135,7 @@ static GstStaticPadTemplate mpegtsmux_sink_factory = "dynamic_range = (int) [ 0, 255 ], " "emphasis = (boolean) { FALSE, TRUE }, " "mute = (boolean) { FALSE, TRUE }; " "audio/x-ac3;" "audio/x-dts;" - "subpicture/x-dvb;" "private/teletext")); + "subpicture/x-dvb;" "application/x-teletext")); static GstStaticPadTemplate mpegtsmux_src_factory = GST_STATIC_PAD_TEMPLATE ("src", @@ -639,7 +639,7 @@ mpegtsmux_create_stream (MpegTsMux * mux, MpegTsPadData * ts_data) } } else if (strcmp (mt, "subpicture/x-dvb") == 0) { st = TSMUX_ST_PS_DVB_SUBPICTURE; - } else if (strcmp (mt, "private/teletext") == 0) { + } else if (strcmp (mt, "application/x-teletext") == 0) { st = TSMUX_ST_PS_TELETEXT; /* needs a particularly sized layout */ ts_data->prepare_func = mpegtsmux_prepare_teletext; |