[Regression] "libswscale/utils.c" inadvertently introduced logical error

[sylware]

Please, test more before committing.

See patch.

[sylware]

patch swscale utils.c

[MasterQuestionable]

͏    Relevant:
͏    ​https://github.com/FFmpeg/FFmpeg/commit/ed5dd675624c83d9c69b406ce30e4e09f29970e3#diff-29d45229c3c98e9f43a9ce70f75b626cb66a8297d680d6fe6f7bba1a54b9c9b4R2552

͏    Proposing patch:

libswscale/utils.c

@@ -2548 +2548 @@
     if (!param)
         param = default_param;
 
-    if (prev && (prev->src_w            == srcW      ||
-                 prev->src_h            == srcH      ||
-                 prev->src_format       == srcFormat ||
-                 prev->dst_w            == dstW      ||
-                 prev->dst_h            == dstH      ||
-                 prev->dst_format       == dstFormat ||
-                 prev->flags            == flags     ||
-                 prev->scaler_params[0] == param[0]  ||
+    if (prev && (prev->src_w            == srcW      &&
+                 prev->src_h            == srcH      &&
+                 prev->src_format       == srcFormat &&
+                 prev->dst_w            == dstW      &&
+                 prev->dst_h            == dstH      &&
+                 prev->dst_format       == dstFormat &&
+                 prev->flags            == flags     &&
+                 prev->scaler_params[0] == param[0]  &&
                  prev->scaler_params[1] == param[1])) {
         return prev;
     }

[Niklas Haas]

Fix: https://ffmpeg.org//pipermail/ffmpeg-devel/2024-December/337532.html

[MasterQuestionable]

͏    So this is fixing the non-broken and footgun..?
͏    “This logic was inverted, but "||" was not replaced by "&&".”

[Niklas Haas]

Fixed in 2df655bc2cf8