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

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

Simple merge