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)
* commit '19d7667a81499d4357ec8e0851701e17c238e584':
  vaapi_encode: Add support for writing arbitrary additional packed headers

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

Simple merge
Simple merge