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)
commit9ca5d2de5d14fb60a0b4d2eace73a34e7e33861f
treef8acb253a851095dab44292cc6b639ae96fcfeef
parent46998d037f8bfebee7bb6578df24a5a3b8f41299
parent910973765417f06a4a9ccbd006e4df74c32ecb01
Merge commit '910973765417f06a4a9ccbd006e4df74c32ecb01'

* commit '910973765417f06a4a9ccbd006e4df74c32ecb01':
  hwcontext_dxva2: frame mapping support

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