Merge commit '1ff6cb2ca6652e7d2a929afd33d8ed6268c45568'
authorJames Almer <jamrial@gmail.com>
Wed, 20 Feb 2019 16:54:51 +0000 (13:54 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 20 Feb 2019 16:54:51 +0000 (13:54 -0300)
commitbec3b2041dcc20ab4b06a6b31d09130e1a7166c3
treedf224875431a88946ab85c676ca3f57e8795564b
parentb2f32d60eeaf883bb7d9e1b8cc2fb9a983d08f72
parent1ff6cb2ca6652e7d2a929afd33d8ed6268c45568
Merge commit '1ff6cb2ca6652e7d2a929afd33d8ed6268c45568'

* commit '1ff6cb2ca6652e7d2a929afd33d8ed6268c45568':
  lavc/qsvenc_jpeg: set a default quality
  lavc/qsvenc_jpeg: add async_depth support

This commit is a noop, see
0e3d7d845d9b4596c0dac1f6e99c493af07308ae
92c25963e8b68c47055b813334eaf76599936a90

Merged-by: James Almer <jamrial@gmail.com>