Merge commit '81a4cb8e58'
* commit '81a4cb8e58': vf_hwmap: Add reverse mapping for hardware frames vf_hwmap: Add device derivation hwcontext: Improve allocation in derived contexts hwcontext_qsv: Implement mapping frames to the child device type hwcontext_qsv: Implement mapping frames from the child device type hwcontext: Add frame context mapping for nontrivial contexts hwcontext_qsv: Support derivation from child devices avconv: Support setting the hardware device to use when filtering avconv_hw: Add implicit device creation with default parameters vp9_raw_reorder_bsf: Remove a redundant allocation This commit is a noop, see49419925d306043cc0bc7ce47090ce045ff8d30aec3dbeae81f82ace71c0a97fb14418d59c6a3aebb2ef1f42bad81be0a60aMerged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
550e5d6602