summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2013-05-15 22:24:29 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2013-05-15 22:24:29 -0400
commit220f075423b38303a53d9cb96fe4ea55addbd5d9 (patch)
treec7937147519f042b0755b1c50c4c012055804a8d
parentd0524c0579ebef7293e0bc4e2cd2536f17f1d746 (diff)
downloadgstreamer-plugins-bad-220f075423b38303a53d9cb96fe4ea55addbd5d9.tar.gz
dashdemux: Announce correct mpegts caps
-rw-r--r--ext/dash/gstdashdemux.c6
-rw-r--r--ext/dash/gstmpdparser.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/dash/gstdashdemux.c b/ext/dash/gstdashdemux.c
index a5cfa518d..5d88d56cc 100644
--- a/ext/dash/gstdashdemux.c
+++ b/ext/dash/gstdashdemux.c
@@ -1726,7 +1726,7 @@ gst_dash_demux_get_video_input_caps (GstDashDemux * demux,
if (mimeType == NULL)
return NULL;
- caps = gst_caps_new_empty_simple (mimeType);
+ caps = gst_caps_from_string (mimeType);
if (width > 0 && height > 0) {
gst_caps_set_simple (caps, "width", G_TYPE_INT, width, "height",
G_TYPE_INT, height, NULL);
@@ -1755,7 +1755,7 @@ gst_dash_demux_get_audio_input_caps (GstDashDemux * demux,
if (mimeType == NULL)
return NULL;
- caps = gst_caps_new_empty_simple (mimeType);
+ caps = gst_caps_from_string (mimeType);
if (rate > 0) {
gst_caps_set_simple (caps, "rate", G_TYPE_INT, rate, NULL);
}
@@ -1780,7 +1780,7 @@ gst_dash_demux_get_application_input_caps (GstDashDemux * demux,
if (mimeType == NULL)
return NULL;
- caps = gst_caps_new_empty_simple (mimeType);
+ caps = gst_caps_from_string (mimeType);
return caps;
}
diff --git a/ext/dash/gstmpdparser.c b/ext/dash/gstmpdparser.c
index 0cb3d2c12..0871af204 100644
--- a/ext/dash/gstmpdparser.c
+++ b/ext/dash/gstmpdparser.c
@@ -3608,7 +3608,7 @@ gst_mpdparser_mimetype_to_caps (const gchar * mimeType)
if (mimeType == NULL)
return NULL;
if (strcmp (mimeType, "video/mp2t") == 0) {
- return "video/mpegts";
+ return "video/mpegts, systemstream=(bool) true";
} else if (strcmp (mimeType, "video/mp4") == 0) {
return "video/quicktime";
} else if (strcmp (mimeType, "audio/mp4") == 0) {