1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

Merge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'

* commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e':
  ratecontrol: Use correct function pointer casts instead of void*

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-03-31 16:19:30 -03:00
commit c4fd1e7b01

View 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[] = {