diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-31 16:19:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-31 16:19:30 -0300 |
| commit | c4fd1e7b0116a4fc04eae14cc2f7167c5f0a0ea4 (patch) | |
| tree | ae699dbdfa6a208eb05893a185e75253c813bb46 /libavcodec/ratecontrol.c | |
| parent | 66e7b421fa04a6ee751534a0f13c7ab1735aeab7 (diff) | |
| parent | 3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e (diff) | |
| download | ffmpeg-c4fd1e7b0116a4fc04eae14cc2f7167c5f0a0ea4.tar.gz | |
Merge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'
* commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e':
ratecontrol: Use correct function pointer casts instead of void*
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/ratecontrol.c')
| -rw-r--r-- | libavcodec/ratecontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 6b28c7551a..49d169ba25 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -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[] = { |