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)
* commit 'e4cdef00263dc8b3c8de9d34ceacd00dc68979c0':
  vf_scale_qsv: Support increasing hardware frame pool size

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

Simple merge