From 12a54ae4dd8fb54a0e17949580ac854c62d1086c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 3 Oct 2011 15:20:06 +0200 Subject: [PATCH] playbin2: Minor cleanup of decoder-sink compatibility checking code --- gst/playback/gstplaybin2.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index aeca2e9..c32a87f 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -3225,12 +3225,9 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad, * the fixed sink */ if (!gst_element_factory_list_is_type (factory, GST_ELEMENT_FACTORY_TYPE_SINK)) { - gboolean isvideodec = gst_element_factory_list_is_type (factory, GST_ELEMENT_FACTORY_TYPE_DECODER | - GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO); - gboolean isimagedec = gst_element_factory_list_is_type (factory, - GST_ELEMENT_FACTORY_TYPE_DECODER | + GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO | GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE); gboolean isaudiodec = gst_element_factory_list_is_type (factory, GST_ELEMENT_FACTORY_TYPE_DECODER | @@ -3238,9 +3235,7 @@ autoplug_select_cb (GstElement * decodebin, GstPad * pad, /* If it is a decoder and we have a fixed sink for the media * type it outputs, check that the decoder is compatible with this sink */ - if (((isvideodec || isimagedec) && group->video_sink) || - (isaudiodec && group->audio_sink)) { - + if ((isvideodec && group->video_sink) || (isaudiodec && group->audio_sink)) { gboolean compatible = TRUE; GstPad *sinkpad; GstCaps *caps; -- 2.7.4