Merge commit 'e05e5920a4e1f1f15cc8a7c843159d519f6ec18e'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:41:07 +0000 (13:41 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:41:07 +0000 (13:41 -0300)
* commit 'e05e5920a4e1f1f15cc8a7c843159d519f6ec18e':
  qsv: Error out if getting session handle failed in avfilter

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavfilter/qsvvpp.c
libavfilter/vf_deinterlace_qsv.c
libavfilter/vf_scale_qsv.c

Simple merge
Simple merge
Simple merge