Merge commit '11b8030309ee93d79b3a6cd4b83bf00757db1598'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:19:32 +0000 (13:19 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:19:32 +0000 (13:19 +0200)
* commit '11b8030309ee93d79b3a6cd4b83bf00757db1598':
  vaapi_encode: Fix fallback when input does not match any format

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

Simple merge