aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2015-03-13 00:36:41 +0100
committerDiego Biurrun <diego@biurrun.de>2016-11-12 16:47:06 +0100
commit3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e (patch)
tree1ca999b1c6c2ecfe11eb4e4afd48aa392e89efe5
parentdd299a2d6d4d1af9528ed35a8131c35946be5973 (diff)
downloadffmpeg-3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e.tar.gz
ratecontrol: Use correct function pointer casts instead of void*
libavcodec/ratecontrol.c:120:9: warning: ISO C forbids initialization between function pointer and ‘void *’ [-Wpedantic] libavcodec/ratecontrol.c:121:9: warning: ISO C forbids initialization between function pointer and ‘void *’ [-Wpedantic]
-rw-r--r--libavcodec/ratecontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 78a438f53d..097da2ee2c 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -472,8 +472,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[] = {