Merge commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 1 Apr 2017 16:53:40 +0000 (18:53 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 1 Apr 2017 16:53:40 +0000 (18:53 +0200)
commit5c612c5ff8c4adf33ede42ad63183c41334ea2d2
treefec30e602b84b4276d11c58b5812d6f6568a92a8
parent0f9ce9c5fcdb4ae9f990835f6579c33f7619e904
parente18ba2dfd2d19aedc8afccf011d5fd0833352423
Merge commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423'

* commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423':
  hwcontext_dxva2: make sure the sw frame format is the right one during transfer

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