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)
commit5e872d908368e7a246f37e28df1f67e8c4fb08b9
tree33de25f435e0982f6fd8d41c112fc4cd7fa04514
parent40b2878ad3bb12d91b15a7278b6a8862c09f4d54
parent11b8030309ee93d79b3a6cd4b83bf00757db1598
Merge commit '11b8030309ee93d79b3a6cd4b83bf00757db1598'

* commit '11b8030309ee93d79b3a6cd4b83bf00757db1598':
  vaapi_encode: Fix fallback when input does not match any format

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