Some of the quant tables used by Bink are generated at runtime and therefore
not const while some others are stored in the binary and therefore are const.
read_dct_coeffs() takes a const pointer to a quant table as parameter, cast
that parameter to const for the runtime-generated tables.
libavcodec/bink.c:869:58: warning: passing argument 4 of 'read_dct_coeffs' from
incompatible pointer type read_dct_coeffs(gb, dctblock, bink_scan,
binkb_intra_quant, qp);
libavcodec/bink.c:902:58: warning: passing argument 4 of 'read_dct_coeffs' from
incompatible pointer type read_dct_coeffs(gb, dctblock, bink_scan,
binkb_inter_quant, qp);
---
libavcodec/bink.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/bink.c b/libavcodec/bink.c
index 011d2d8..fc3b741 100644
--- a/libavcodec/bink.c
+++ b/libavcodec/bink.c
@@ -859,7 +859,8 @@ static int binkb_decode_plane(BinkContext *c, AVFrame
*frame, BitstreamContext *
memset(dctblock, 0, sizeof(*dctblock) * 64);
dctblock[0] = binkb_get_value(c, BINKB_SRC_INTRA_DC);
qp = binkb_get_value(c, BINKB_SRC_INTRA_Q);
- read_dct_coeffs(bc, dctblock, bink_scan, binkb_intra_quant,
qp);
+ read_dct_coeffs(bc, dctblock, bink_scan,
+ (const int32_t (*)[64]) binkb_intra_quant, qp);
c->binkdsp.idct_put(dst, stride, dctblock);
break;
case 3:
@@ -892,7 +893,8 @@ static int binkb_decode_plane(BinkContext *c, AVFrame
*frame, BitstreamContext *
memset(dctblock, 0, sizeof(*dctblock) * 64);
dctblock[0] = binkb_get_value(c, BINKB_SRC_INTER_DC);
qp = binkb_get_value(c, BINKB_SRC_INTER_Q);
- read_dct_coeffs(bc, dctblock, bink_scan, binkb_inter_quant,
qp);
+ read_dct_coeffs(bc, dctblock, bink_scan,
+ (const int32_t (*)[64]) binkb_inter_quant, qp);
c->binkdsp.idct_add(dst, stride, dctblock);
break;
case 5:
--
2.1.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
