[FFmpeg-cvslog] Merge commit '81a4cb8e58636d4efd200c2b4fec786a7e948d8b'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 30 18:00:28 2017 -0300| [550e5d6602538d272ca4a7e117c6bd29eccb910f] | committer: James Almer

Merge commit '81a4cb8e58636d4efd200c2b4fec786a7e948d8b'

* 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
49419925d33304ff907075289808226a695ff57b
06043cc0bc72b530db352a67776392cf61a54104
7ce47090ce36fbe72f807d1e35fea3a699adad17
045ff8d30a6942b72c8be064c3b8415b037dab02
ec3dbeae8139a8bbd8b0fa4514a3cf349de7f335
f82ace71c0d8dd6500daa7ccce5b1fece8a95341
a97fb14418fd621defec1ea5cd387953407b180d
d59c6a3aebc20cc64cb7a46401cb55f02f4cbe09
b2ef1f42badd1c5731816a3959b6dbb62187dbcc
d81be0a60a6dea2bc48ec29f9466eee63984ed34

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=550e5d6602538d272ca4a7e117c6bd29eccb910f
---