Merge commit '6d86cef06ba36c0ed591e14a2382e9630059fc5d'
authorMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:28:12 +0000 (22:28 +0000)
committerMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:28:12 +0000 (22:28 +0000)
commitbcab11a1a23d8b156198db352bbdb932740a966c
tree827e9acc1a7547c1d5d719e2b7db00971d62f281
parent9471122a1b5dec34572c3d4c675737f0493d140e
parent6d86cef06ba36c0ed591e14a2382e9630059fc5d
Merge commit '6d86cef06ba36c0ed591e14a2382e9630059fc5d'

* commit '6d86cef06ba36c0ed591e14a2382e9630059fc5d':
  lavfi: Add support for increasing hardware frame pool sizes

Merged-by: Mark Thompson <sw@jkqxz.net>
doc/APIchanges
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/internal.h
libavfilter/version.h