Merge commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:24:04 +0000 (17:24 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:24:04 +0000 (17:24 +0000)
commitcb0355537d6a89fc71fbc672ad5dba8a1eadce34
tree111a7e3e125acc80d3a06b9cbfdfbc05aea35b29
parent0d4c0240affc09eb2c9f6ccacac2ed14321b1e34
parentd847a40888c064cc8c35b546fc5a0ccb69136a7c
Merge commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c'

* commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c':
  hwcontext_cuda/vdpau: add to skipheaders

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavutil/Makefile