Merge commit 'c6bc18bc121ea66df715123c59f7ef9542c0914a'
authorMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:56:12 +0000 (22:56 +0000)
committerMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:56:12 +0000 (22:56 +0000)
commitb668a1c8b35d7b45eb32cba465fb99b99355998c
tree235625a64c74b35ff282a73fb15333f6e16e5d94
parent6e050e0085b3f6f1109a0593aad63ec6e6bf23ff
parentc6bc18bc121ea66df715123c59f7ef9542c0914a
Merge commit 'c6bc18bc121ea66df715123c59f7ef9542c0914a'

* commit 'c6bc18bc121ea66df715123c59f7ef9542c0914a':
  vf_hwupload/hwmap: Support setting a fixed pool size

Merged-by: Mark Thompson <sw@jkqxz.net>
libavfilter/vf_hwmap.c
libavfilter/vf_hwupload.c