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)
* commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0':
  vaapi_h264: Add support for VUI parameters

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

Simple merge