summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2014-08-29 19:24:52 +0100
committerTim-Philipp Müller <tim@centricular.com>2014-08-29 19:24:52 +0100
commitd8b5675ddcaec2d61949722b47a8dc0c5528dd50 (patch)
tree781d5ed08aefb2bf453895ec67cef92f67c88f65
parentea7d5027a079fad397b0ad97a0be48c69121e30e (diff)
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.
-rw-r--r--gst/dvbsuboverlay/gstdvbsuboverlay.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/gst/dvbsuboverlay/gstdvbsuboverlay.c b/gst/dvbsuboverlay/gstdvbsuboverlay.c
index 3965b657f..7d580d61f 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);