Merge commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 10:03:06 +0000 (12:03 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 10:03:06 +0000 (12:03 +0200)
commit3e71e34333c7cd1225de4807bf86fff01ba8fd01
treead53e8ca5eac37065ce20c8f7137200551c2bced
parentfc0eafb7f8b289aa6dcef0c26b3f615f551925ab
parent081961f819c0b16c7a860d7da7d39f1fd91bd2f0
Merge commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0'

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

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