Merge commit '8bb9824fcbc5a6ebf68391d70a2c4f03447990d2'
authorMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 23:01:24 +0000 (23:01 +0000)
committerMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 23:01:24 +0000 (23:01 +0000)
commitde3be1d09f31e0f5c72240fc0270067c5c6d2510
tree3fc245c4c4532ba2338ca00fd7590ff1af7674a2
parente9dfc6f9006f81d6267d183b00616053b514df8f
parent8bb9824fcbc5a6ebf68391d70a2c4f03447990d2
Merge commit '8bb9824fcbc5a6ebf68391d70a2c4f03447990d2'

* commit '8bb9824fcbc5a6ebf68391d70a2c4f03447990d2':
  qsvenc: AVBR is not supported on non-windows OS

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/qsvenc.c
libavcodec/qsvenc.h