Merge commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 15:23:16 +0000 (15:23 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 15:23:16 +0000 (15:23 +0000)
commit6992276acaaee32b33bd5f6e2f0d89588c4ae59a
treecd5d035d3293ae6076de0b6cc0a41e132e64539d
parent63c3e35332838fca19b7ffdae13233b0f3759402
parentad884d100259e55cb51a4239cd8a4fd5154c2073
Merge commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073'

* commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073':
  hwcontext: add a CUDA implementation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
doc/APIchanges
libavutil/Makefile
libavutil/hwcontext.c
libavutil/hwcontext.h
libavutil/hwcontext_cuda.c
libavutil/hwcontext_cuda.h
libavutil/hwcontext_internal.h