From: Clément Bœsch <clement@stupeflix.com>
Date: Wed, 29 Jun 2016 10:03:06 +0000 (+0200)
Subject: Merge commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0'
X-Git-Tag: n3.2~1208
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/3e71e34333c7cd1225de4807bf86fff01ba8fd01

Merge commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0'

* commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0':
  vaapi_h264: Add support for VUI parameters

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

3e71e34333c7cd1225de4807bf86fff01ba8fd01