Merge commit '81a4cb8e58636d4efd200c2b4fec786a7e948d8b'

Browse Source

* commit '81a4cb8e58636d4efd200c2b4fec786a7e948d8b':
  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
49419925d3
06043cc0bc
7ce47090ce
045ff8d30a
ec3dbeae81
f82ace71c0
a97fb14418
d59c6a3aeb
b2ef1f42ba
d81be0a60a

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

pull/272/head

James Almer 7 years ago

parent 9ea06d48c2 81a4cb8e58

commit 550e5d6602

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available