mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegts: private/teletext -> application/x-teletext

Browse source
This commit is contained in:
Tim-Philipp Müller 2013-07-30 16:08:17 +01:00
parent dd83d3f46c
commit 646ba6b3df
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/mpegtsdemux/tsdemux.c
View file

@ -826,7 +826,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
GST_LOG ("teletext"); GST_LOG ("teletext");
template = gst_static_pad_template_get (&private_template); template = gst_static_pad_template_get (&private_template);
name = g_strdup_printf ("private_%04x", bstream->pid); 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; break;
} }
desc = desc =

4
gst/mpegtsmux/mpegtsmux.c
View file

@ -135,7 +135,7 @@ static GstStaticPadTemplate mpegtsmux_sink_factory =
"dynamic_range = (int) [ 0, 255 ], " "dynamic_range = (int) [ 0, 255 ], "
"emphasis = (boolean) { FALSE, TRUE }, " "emphasis = (boolean) { FALSE, TRUE }, "
"mute = (boolean) { FALSE, TRUE }; " "audio/x-ac3;" "audio/x-dts;" "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 = static GstStaticPadTemplate mpegtsmux_src_factory =
GST_STATIC_PAD_TEMPLATE ("src", 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) { } else if (strcmp (mt, "subpicture/x-dvb") == 0) {
st = TSMUX_ST_PS_DVB_SUBPICTURE; 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; st = TSMUX_ST_PS_TELETEXT;
/* needs a particularly sized layout */ /* needs a particularly sized layout */
ts_data->prepare_func = mpegtsmux_prepare_teletext; ts_data->prepare_func = mpegtsmux_prepare_teletext;