From: Hendrik Leppkes Date: Sat, 1 Apr 2017 16:53:40 +0000 (+0200) Subject: Merge commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423' X-Git-Tag: n3.3~45 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=5c612c5ff8c4adf33ede42ad63183c41334ea2d2 Merge commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423' * commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423': hwcontext_dxva2: make sure the sw frame format is the right one during transfer Merged-by: Hendrik Leppkes --- 5c612c5ff8c4adf33ede42ad63183c41334ea2d2