Merge commit '0d3176e32f351d18d6174d8b05796829a75a4c6b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 1 Apr 2017 16:53:27 +0000 (18:53 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 1 Apr 2017 16:53:27 +0000 (18:53 +0200)
commitd91e7aac122fef557afe9695ea2c9780ecc742ca
tree11426bd9678f3644e2a965dbbed6d609c24a123a
parent358d4524cc8fda2660679d8080cfe937b41c73c3
parent0d3176e32f351d18d6174d8b05796829a75a4c6b
Merge commit '0d3176e32f351d18d6174d8b05796829a75a4c6b'

* commit '0d3176e32f351d18d6174d8b05796829a75a4c6b':
  hwcontext_dxva2: do not assume the destination format during mapping is always the right one

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