summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@noraisin.net>2009-05-21 23:11:29 +0100
committerJan Schmidt <thaytan@noraisin.net>2009-05-28 22:07:30 +0100
commit47d7464b10f2a201e9fd3f7a002ae3adced37e42 (patch)
tree2b6900030be744f90eedc55ff5c8440450adfb51
parenteffa5e69d9ca229a38e18429a7700664cb41cf49 (diff)
decodebin/uridecodebin: Recognise subpicture/x-pgs pads and output them.
-rw-r--r--gst/playback/gstdecodebin2.c2
-rw-r--r--gst/playback/gsturidecodebin.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 6ff9223c5..f03d29ca3 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -656,7 +656,7 @@ gst_decode_bin_init (GstDecodeBin * decode_bin)
decode_bin->caps =
gst_caps_from_string ("video/x-raw-yuv;video/x-raw-rgb;video/x-raw-gray;"
"audio/x-raw-int;audio/x-raw-float;" "text/plain;text/x-pango-markup;"
- "video/x-dvd-subpicture");
+ "video/x-dvd-subpicture; subpicture/x-pgs");
}
static void
diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c
index 9a6770995..146aa9413 100644
--- a/gst/playback/gsturidecodebin.c
+++ b/gst/playback/gsturidecodebin.c
@@ -774,7 +774,7 @@ static const gchar *no_media_mimes[] = {
/* media types we consider raw media */
static const gchar *raw_media[] = {
"audio/x-raw", "video/x-raw", "text/plain", "text/x-pango-markup",
- "video/x-dvd-subpicture", NULL
+ "video/x-dvd-subpicture", "subpicture/x-", NULL
};
#define IS_STREAM_URI(uri) (array_has_value (stream_uris, uri))