Merge commit '2940e196c5e439d9869f8c02a49a318d0847453c'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 10:03:47 +0000 (12:03 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 10:03:47 +0000 (12:03 +0200)
commit6c841e03cebadc566a2c59a4891377eeb9ff03e9
tree8081ff39c35202397a4416e4d03fd1954c0c3222
parent4b90413cb26eea61a23bc5e9672543cc7da81f92
parent2940e196c5e439d9869f8c02a49a318d0847453c
Merge commit '2940e196c5e439d9869f8c02a49a318d0847453c'

* commit '2940e196c5e439d9869f8c02a49a318d0847453c':
  vaapi_h265: cu_qp_delta should not be used in constant-QP mode

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/vaapi_encode_h265.c