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)
* commit 'c6bc18bc121ea66df715123c59f7ef9542c0914a':
  vf_hwupload/hwmap: Support setting a fixed pool size

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

Simple merge
Simple merge