2 files changed, 3 insertions, 5 deletions
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index 9a1aa29ea..8962a1948 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -5151,11 +5151,8 @@ done:
           }
         }
         gst_caps_unref (target_caps);
-        target_caps = tmp;
+        result = gst_caps_merge (result, tmp);
       }
-
-
-      result = gst_caps_merge (result, target_caps);
       gst_object_unref (target);
     }
   }
diff --git a/gst/playback/gstplaybin3.c b/gst/playback/gstplaybin3.c
index e0e422f12..a023e5a1c 100644
--- a/gst/playback/gstplaybin3.c
+++ b/gst/playback/gstplaybin3.c
@@ -4322,7 +4322,8 @@ done:
     if (target) {
       GstCaps *target_caps = gst_pad_get_pad_template_caps (target);
       GST_PLAY_BIN3_FILTER_CAPS (filter, target_caps);
-      result = gst_caps_merge (result, target_caps);
+      if (!gst_caps_is_any (target_caps))
+        result = gst_caps_merge (result, target_caps);
       gst_object_unref (target);
     }
   }