Merge commit '2d518aec4c781316092be65893b47922c8f71b67'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 16:03:58 +0000 (13:03 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 16:03:58 +0000 (13:03 -0300)
commitbf209013bff8f70facd9eada39009eff05f8e202
treefb14e3249c9f87d72cb26afc10a6deef37d12d53
parente63e0b65446b16af4f2016fcd034a650f93f4b88
parent2d518aec4c781316092be65893b47922c8f71b67
Merge commit '2d518aec4c781316092be65893b47922c8f71b67'

* commit '2d518aec4c781316092be65893b47922c8f71b67':
  vf_deinterlace_vaapi: Create filter buffer after context
  vaapi_encode: Discard output buffer if picture submission fails

This commit is a noop, see
92bd08974541611731b2d58723826ea26ecbe47d
359586f14f46bf3f9c1ae3375d80e8c0fc377bef

Merged-by: James Almer <jamrial@gmail.com>