Merge commit 'e4cdef00263dc8b3c8de9d34ceacd00dc68979c0'
authorMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:55:24 +0000 (22:55 +0000)
committerMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:55:24 +0000 (22:55 +0000)
commit6e050e0085b3f6f1109a0593aad63ec6e6bf23ff
treef93214750c1d5775df01ef29f6769b01b9374e4c
parenta5ed07940c6929cadc44073f355cd15cfba7161e
parente4cdef00263dc8b3c8de9d34ceacd00dc68979c0
Merge commit 'e4cdef00263dc8b3c8de9d34ceacd00dc68979c0'

* commit 'e4cdef00263dc8b3c8de9d34ceacd00dc68979c0':
  vf_scale_qsv: Support increasing hardware frame pool size

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