Merge commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 10:03:28 +0000 (12:03 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 10:03:28 +0000 (12:03 +0200)
* commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8':
  vaapi_h264: Add support for SEI messages

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

Simple merge