Merge commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:44:25 +0000 (15:44 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:44:25 +0000 (15:44 +0200)
* commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32':
  vaapi_encode: Check config attributes before creating config

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/vaapi_encode.c

Simple merge