Merge commit '910973765417f06a4a9ccbd006e4df74c32ecb01'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 30 Mar 2017 09:33:51 +0000 (11:33 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 30 Mar 2017 09:33:51 +0000 (11:33 +0200)
* commit '910973765417f06a4a9ccbd006e4df74c32ecb01':
  hwcontext_dxva2: frame mapping support

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavutil/hwcontext_dxva2.c

Simple merge