From b9cbfcdeb45f39998cd46ee0c9154fc0af704db2 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 11 Dec 2014 13:45:38 +0100 Subject: [PATCH] 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. --- gst/playback/gstplaybin2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index 7036e19dad..2a1ce63580 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -2599,12 +2599,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));