ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri Mar 31 16:19:30 2017 -0300| [c4fd1e7b0116a4fc04eae14cc2f7167c5f0a0ea4] | committer: James Almer
Merge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e' * commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e': ratecontrol: Use correct function pointer casts instead of void* Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4fd1e7b0116a4fc04eae14cc2f7167c5f0a0ea4 --- libavcodec/ratecontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 6b28c75..49d169b 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[] = { ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
