shithub: dav1d

Download patch

ref: 666c71a04056724ce73a80a9113ce505a08f8595
parent: e65abadff6872d319ece76c8617604c628c3126e
author: Henrik Gramner <gramner@twoorioles.com>
date: Tue Sep 3 22:17:16 EDT 2019

Fix clang-cl assertion warning

clang-cl doesn't like function calls in __assume statements, even
trivial inline ones.

--- a/src/decode.c
+++ b/src/decode.c
@@ -647,7 +647,7 @@
         }
         b->uvtx = dav1d_max_txfm_size_for_bs[bs][f->cur.p.layout];
     } else {
-        assert(imin(bw4, bh4) <= 16 || b->max_ytx == TX_64X64);
+        assert(bw4 <= 16 || bh4 <= 16 || b->max_ytx == TX_64X64);
         int y, x, y_off, x_off;
         const TxfmInfo *const ytx = &dav1d_txfm_dimensions[b->max_ytx];
         for (y = 0, y_off = 0; y < bh4; y += ytx->h, y_off++) {