Merge commit '0aec37e625821040c103641eec9c1e7a1efa2952'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:04:33 +0000 (13:04 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:04:33 +0000 (13:04 +0100)
commit9da2b376683b36afd846d83deca13e3df3c11f95
tree5f7f516d565585419d21c31839b00552f5375404
parentb0625388411ae8839a5aee1e246f9438939d8165
parent0aec37e625821040c103641eec9c1e7a1efa2952
Merge commit '0aec37e625821040c103641eec9c1e7a1efa2952'

* commit '0aec37e625821040c103641eec9c1e7a1efa2952':
  vaapi_decode: Remove vestigial unmap code
  vaapi_decode: Clear parameter buffers to fix picture reuse

This merge is a noop, see 79307ae56374b35cf12563a7c8e3e759658f847e

Merged-by: Clément Bœsch <u@pkh.me>