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)
* commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423':
  hwcontext_dxva2: make sure the sw frame format is the right one during transfer

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

Simple merge