Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'
authorJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 23:34:23 +0000 (20:34 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 23:34:23 +0000 (20:34 -0300)
commitf790410b6baa4ee53e8a5796e986de0cae78b073
treedc092d2c1bf35c8eb9888f7b3f77c4720bacf423
parentae7e66fb4b1a256fb79a016b9c585de84ac77339
parentcca5e4f040971db6de0bfe6968f00c021d8a9c42
Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'

* commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42':
  qsv: adding Multi Frame Encode support

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/qsv.c
libavcodec/qsv_internal.h
libavcodec/qsvenc.c
libavcodec/qsvenc.h
libavcodec/qsvenc_h264.c
libavfilter/qsvvpp.c
libavfilter/qsvvpp.h
libavfilter/vf_deinterlace_qsv.c
libavfilter/vf_scale_qsv.c
libavutil/hwcontext_qsv.c