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)
* commit '2940e196c5e439d9869f8c02a49a318d0847453c':
  vaapi_h265: cu_qp_delta should not be used in constant-QP mode

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

Simple merge