summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2014-08-29 19:26:40 +0100
committerTim-Philipp Müller <tim@centricular.com>2014-08-29 19:26:40 +0100
commitcd325defcaf45ce0f8948fe8ca000cad4daf6c1d (patch)
treefc17ddfa1a4f999b09dfbe2b96ef6f014e1452e2
parentd8b5675ddcaec2d61949722b47a8dc0c5528dd50 (diff)
assrender: remove code that can't be reached
If this code could ever be reached, it would leak memory (CID 1231979), but gst_caps_get_features() never returns NULL, so that can't happen.
-rw-r--r--ext/assrender/gstassrender.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/ext/assrender/gstassrender.c b/ext/assrender/gstassrender.c
index b9884901b..711ab04ea 100644
--- a/ext/assrender/gstassrender.c
+++ b/ext/assrender/gstassrender.c
@@ -814,13 +814,8 @@ gst_ass_render_setcaps_video (GstPad * pad, GstAssRender * render,
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 (render->srcpad, overlay_caps);
GST_DEBUG_OBJECT (render, "Downstream accepts the overlay meta: %d", ret);