Merge commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:00:30 +0000 (16:00 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:00:30 +0000 (16:00 -0300)
commitd658e04337c590043190718ec4a8137d3e8216b9
tree8e9ce08b38422f730f3cd78fb10f1c15c444ca40
parentf7eb1c9ac55bd27583419fb09c3dbb70b3ce56bc
parent06c20d3e32c33c4da6d9fbc43aebaeb38c45b859
Merge commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859'

* commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859':
  lavc: Drop deprecated av_fast_malloc() compatibility

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>