Merge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:19:30 +0000 (16:19 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:19:30 +0000 (16:19 -0300)
* commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e':
  ratecontrol: Use correct function pointer casts instead of void*

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/ratecontrol.c

index 6b28c75..49d169b 100644 (file)
@@ -497,8 +497,8 @@ av_cold int ff_rate_control_init(MpegEncContext *s)
         NULL
     };
     static double (* const func1[])(void *, double) = {
-        (void *)bits2qp,
-        (void *)qp2bits,
+        (double (*)(void *, double)) bits2qp,
+        (double (*)(void *, double)) qp2bits,
         NULL
     };
     static const char * const func1_names[] = {