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)
* commit '8ad9f9d675eab139aa2208722009eeed981460dd':
  hwcontext_vaapi: Frame mapping support

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

Simple merge