]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'f01f7a7846529b7c3ef343f117eaa2c0a1457af0'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 07:37:40 +0000 (08:37 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 07:37:40 +0000 (08:37 +0100)
* commit 'f01f7a7846529b7c3ef343f117eaa2c0a1457af0':
  hwcontext_dxva2: use the special UC copy for downloading frames

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavutil/hwcontext_dxva2.c

Simple merge