summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2014-12-11 13:45:38 +0100
committerTim-Philipp Müller <tim@centricular.com>2014-12-11 14:24:29 +0000
commit943e371a56868b90c0bdfc284792851cf73c9823 (patch)
tree982a7625dea4a5d8410d8e0fbca6c03094034335
parentffb284efc37f1011aca7677a9f294366b9c493c0 (diff)
playbin: Do not mix up stream type when getting stream combiner element
We were always returning the video stream combiner whatever stream type combiner was wanted.
-rw-r--r--gst/playback/gstplaybin2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index 08ff9aa4e..2b7416ef2 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -2568,12 +2568,12 @@ gst_play_bin_get_property (GObject * object, guint prop_id, GValue * value,
case PROP_AUDIO_STREAM_COMBINER:
g_value_take_object (value,
gst_play_bin_get_current_stream_combiner (playbin,
- &playbin->audio_stream_combiner, "audio", PLAYBIN_STREAM_VIDEO));
+ &playbin->audio_stream_combiner, "audio", PLAYBIN_STREAM_AUDIO));
break;
case PROP_TEXT_STREAM_COMBINER:
g_value_take_object (value,
gst_play_bin_get_current_stream_combiner (playbin,
- &playbin->text_stream_combiner, "text", PLAYBIN_STREAM_VIDEO));
+ &playbin->text_stream_combiner, "text", PLAYBIN_STREAM_TEXT));
break;
case PROP_VOLUME:
g_value_set_double (value, gst_play_sink_get_volume (playbin->playsink));