[FFmpeg-devel] [PATCH 06/10] avcodec/ratecontrol: Avoid function pointer casts

[Andreas Rheinhardt]

It is undefined behaviour to call a function with a different
signature for the call than the actual function signature;
there are no exceptions for void* and RateControlEntry*.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavcodec/ratecontrol.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 1e861e20c1..1ff209c00b 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -79,6 +79,11 @@ static inline double qp2bits(RateControlEntry *rce, double qp)
     return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits + 1) / qp;
 }
 
+static double qp2bits_cb(void *rce, double qp)
+{
+    return qp2bits(rce, qp);
+}
+
 static inline double bits2qp(RateControlEntry *rce, double bits)
 {
     if (bits < 0.9) {
@@ -87,6 +92,11 @@ static inline double bits2qp(RateControlEntry *rce, double bits)
     return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits + 1) / bits;
 }
 
+static double bits2qp_cb(void *rce, double qp)
+{
+    return bits2qp(rce, qp);
+}
+
 static double get_diff_limited_q(MpegEncContext *s, RateControlEntry *rce, double q)
 {
     RateControlContext *rcc   = &s->rc_context;
@@ -507,8 +517,8 @@ av_cold int ff_rate_control_init(MpegEncContext *s)
         NULL
     };
     static double (* const func1[])(void *, double) = {
-        (double (*)(void *, double)) bits2qp,
-        (double (*)(void *, double)) qp2bits,
+        bits2qp_cb,
+        qp2bits_cb,
         NULL
     };
     static const char * const func1_names[] = {
-- 
2.40.1