Merge commit '5a1d605ceae448b476a525f7368ec452000d1f26'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 1 Apr 2017 16:53:36 +0000 (18:53 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 1 Apr 2017 16:53:36 +0000 (18:53 +0200)
* commit '5a1d605ceae448b476a525f7368ec452000d1f26':
  hwcontext_dxva2: split transfer_data() into upload/download functions

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

Simple merge