Merge commit '8ad9f9d675eab139aa2208722009eeed981460dd'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:55:32 +0000 (10:55 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:55:32 +0000 (10:55 +0200)
commit71c22fb7aec9a3f81c00bdc990e14a276bf163a4
tree6e8b8ac512e6e9c8fde2c6e9b82d9ff27313afdf
parent6234fd2fa0123d8b6802a337d456cfb82ae57e49
parent8ad9f9d675eab139aa2208722009eeed981460dd
Merge commit '8ad9f9d675eab139aa2208722009eeed981460dd'

* commit '8ad9f9d675eab139aa2208722009eeed981460dd':
  hwcontext_vaapi: Frame mapping support

Merged-by: Clément Bœsch <cboesch@gopro.com>
libavutil/hwcontext_vaapi.c