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

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

Simple merge