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)
* commit '8bb9824fcbc5a6ebf68391d70a2c4f03447990d2':
  qsvenc: AVBR is not supported on non-windows OS

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

Simple merge
Simple merge