Merge commit '508378556631dc18d32247b4a4e35703758e1ca9'
authorJames Almer <jamrial@gmail.com>
Thu, 14 Dec 2017 22:04:37 +0000 (19:04 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 14 Dec 2017 22:05:55 +0000 (19:05 -0300)
commit374f818bfbc5f7ad3a88f6a17770abb14abec4d1
tree460eb0eaa23712634cb0eb45891618719fdca853
parentb4718b76937a6677ce89866e06d929d778c57b64
parent508378556631dc18d32247b4a4e35703758e1ca9
Merge commit '508378556631dc18d32247b4a4e35703758e1ca9'

* commit '508378556631dc18d32247b4a4e35703758e1ca9':
  qsv: Support explicit lookahead downscaling

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/qsvenc.c
libavcodec/qsvenc.h
libavcodec/qsvenc_h264.c