Merge commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:25:24 +0000 (15:25 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:25:24 +0000 (15:25 +0200)
* commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded':
  hwcontext_dxva2: implement device creation

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

Simple merge