Commit 550e5d66 authored by James Almer's avatar James Almer

Merge commit '81a4cb8e'

* commit '81a4cb8e':
  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, see
49419925
06043cc0
7ce47090
045ff8d3
ec3dbeae
f82ace71
a97fb144
d59c6a3a
b2ef1f42
d81be0a6Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 9ea06d48 81a4cb8e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment