Merge commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:12:18 +0000 (19:12 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:12:18 +0000 (19:12 -0300)
commitaebc5b2284db1f40a5b3e2e9a2bf406f606436c7
tree744c9dc21d9d30620ed28ad436f8b4412434690f
parentde33b3e457a656230fc6d544a1889218d77a5b3c
parentf8060865f3e1a16c62e0d337ef0979b6ee4ba457
Merge commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457'

* commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457':
  qsvenc: use the compression_level to replace private option

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