playbin3: Always register 'playbin3' element.
authorJan Schmidt <jan@centricular.com>
Sat, 9 Oct 2021 14:24:44 +0000 (01:24 +1100)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Sun, 10 Oct 2021 07:28:17 +0000 (07:28 +0000)
If the USE_PLAYBIN3=1 env var is set, we want to replace
playbin with playbin3, but separate to that, we always
want to register the 'playbin3' element so that applications
which explicitly use playbin3 work regardless of the env var.

This fixes `USE_PLAYBIN3=1 gst-validate-launcher`, for example.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1102>

subprojects/gst-plugins-base/gst/playback/gstplaybin3.c

index b793664..70a19fe 100644 (file)
@@ -5196,12 +5196,13 @@ gst_play_bin3_custom_element_init (GstPlugin * plugin)
 
   playback_element_init (plugin);
 
-  if (g_getenv ("USE_PLAYBIN3"))
+  if (g_getenv ("USE_PLAYBIN3")) {
     ret &= gst_element_register (plugin, "playbin", GST_RANK_NONE,
         GST_TYPE_PLAY_BIN);
-  else
-    ret &= gst_element_register (plugin, "playbin3", GST_RANK_NONE,
-        GST_TYPE_PLAY_BIN);
+  }
+
+  ret &= gst_element_register (plugin, "playbin3", GST_RANK_NONE,
+      GST_TYPE_PLAY_BIN);
 
   return ret;
 }