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)
commitcc3de390b724f1c4c4ac7887d52908881a57e060
tree29a5645cffc7b76e6237a603d98db72955ab7ec2
parent19fe328f12f6658f7e3feb521ee81a8b13e76e49
parent48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8
Merge commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8'

* commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8':
  vaapi_h264: Add support for SEI messages

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