From d8b5675ddcaec2d61949722b47a8dc0c5528dd50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 29 Aug 2014 19:24:52 +0100 Subject: [PATCH] dvbsuboverlay: remove code that can't be reached If this code could ever be reached, it would leak memory (CID 1231977), but gst_caps_get_features() never returns NULL, so that can't happen. --- gst/dvbsuboverlay/gstdvbsuboverlay.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gst/dvbsuboverlay/gstdvbsuboverlay.c b/gst/dvbsuboverlay/gstdvbsuboverlay.c index 3965b65..7d580d6 100644 --- a/gst/dvbsuboverlay/gstdvbsuboverlay.c +++ b/gst/dvbsuboverlay/gstdvbsuboverlay.c @@ -692,13 +692,8 @@ gst_dvbsub_overlay_negotiate (GstDVBSubOverlay * overlay, GstCaps * caps) overlay_caps = gst_caps_copy (caps); f = gst_caps_get_features (overlay_caps, 0); - if (f == NULL) { - f = gst_caps_features_new - (GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, NULL); - } else { - gst_caps_features_add (f, - GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION); - } + gst_caps_features_add (f, + GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION); ret = gst_pad_peer_query_accept_caps (overlay->srcpad, overlay_caps); GST_DEBUG_OBJECT (overlay, "Downstream accepts the overlay meta: %d", ret); -- 2.7.4