Merge commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:36:37 +0000 (10:36 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:36:37 +0000 (10:36 +0200)
commit4cda23f1f146211825edbf7a4aed0feeaa00711f
treee8fa1d53400df0e7b07599f63018d46cde142cd4
parent03f5e80bdbbfa3229b6af3ad7bc94cc1468cc1b6
parentd06aa24ba583ad08025da9e1b29afcd8218ff9b0
Merge commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0'

* commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0':
  hwcontext: Hardware frame mapping

Merged-by: Clément Bœsch <cboesch@gopro.com>
doc/APIchanges
libavutil/hwcontext.c
libavutil/hwcontext.h
libavutil/hwcontext_internal.h
libavutil/version.h