--- gst-plugins-base-1.26.1/gst/videoconvertscale/gstvideoconvertscale.c.old	2025-04-24 14:20:14.000000000 -0500
+++ gst-plugins-base-1.26.1/gst/videoconvertscale/gstvideoconvertscale.c	2025-05-11 14:05:05.042191384 -0500
@@ -1407,8 +1407,13 @@
     g_return_val_if_fail (gst_value_is_fixed (from_par), othercaps);
 
     gst_video_convert_scale_get_fraction (from_par, &from_par_n, &from_par_d);
-    gst_structure_get (ins,
-        "width", G_TYPE_INT, &from_w, "height", G_TYPE_INT, &from_h, NULL);
+    {
+      gint wi = 0, hi = 0;
+      gst_structure_get (ins,
+          "width", G_TYPE_INT, &wi, "height", G_TYPE_INT, &hi, NULL);
+      from_w = wi;
+      from_h = hi;
+    }
 
     {
       gint wi = 0, hi = 0;
--- gst-plugins-base-1.26.1/tests/check/elements/audiomixer.c.old	2025-04-24 14:20:14.000000000 -0500
+++ gst-plugins-base-1.26.1/tests/check/elements/audiomixer.c	2025-05-11 14:06:12.944933423 -0500
@@ -2125,12 +2125,18 @@
   gst_message_unref (msg);
 }
 
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+#define AUDIO_FMT "S16LE"
+#else
+#define AUDIO_FMT "S16BE"
+#endif
+
 GST_START_TEST (test_qos_message_live)
 {
   GstBus *bus = gst_bus_new ();
   GstHarness *h, *h2;
   GstBuffer *b;
-  static const char *caps_str = "audio/x-raw, format=(string)S16LE, "
+  static const char *caps_str = "audio/x-raw, format=(string)" AUDIO_FMT ", "
       "rate=(int)1000, channels=(int)1, layout=(string)interleaved";
   GstMessage *msg;
   GstPad *pad;