[FFmpeg-cvslog] Merge commit '1ff6cb2ca6652e7d2a929afd33d8ed6268c45568'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Feb 20 13:54:51 2019 -0300| [bec3b2041dcc20ab4b06a6b31d09130e1a7166c3] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bec3b2041dcc20ab4b06a6b31d09130e1a7166c3
---