Merge commit '04b0f0e371ff81b682274b574fb465ba4395c09f'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 19:08:14 +0000 (16:08 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 19:08:14 +0000 (16:08 -0300)
commit4959f18a8e11ad7d3529b1c4fc429f1b6b76ad7c
tree9154851bfccf366ea5fd13b9de33dfd9ecc22cd3
parentf9c3fbc00cd6c8887e0e66cec275ade881130adf
parent04b0f0e371ff81b682274b574fb465ba4395c09f
Merge commit '04b0f0e371ff81b682274b574fb465ba4395c09f'

* commit '04b0f0e371ff81b682274b574fb465ba4395c09f':
  mem: uninline av_malloc(z)_array()

Merged-by: James Almer <jamrial@gmail.com>
libavutil/mem.c
libavutil/mem.h