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)
commitc4fd1e7b0116a4fc04eae14cc2f7167c5f0a0ea4
treeae699dbdfa6a208eb05893a185e75253c813bb46
parent66e7b421fa04a6ee751534a0f13c7ab1735aeab7
parent3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e
Merge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'

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

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