Merge commit '19d7667a81499d4357ec8e0851701e17c238e584'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 10:03:20 +0000 (12:03 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 10:03:20 +0000 (12:03 +0200)
commit19fe328f12f6658f7e3feb521ee81a8b13e76e49
tree68f662df03c9f853749c970b8957fa7493023563
parent3e71e34333c7cd1225de4807bf86fff01ba8fd01
parent19d7667a81499d4357ec8e0851701e17c238e584
Merge commit '19d7667a81499d4357ec8e0851701e17c238e584'

* commit '19d7667a81499d4357ec8e0851701e17c238e584':
  vaapi_encode: Add support for writing arbitrary additional packed headers

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