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)
* commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457':
  qsvenc: use the compression_level to replace private option

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

Simple merge