Merge commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 17 Feb 2016 16:16:34 +0000 (16:16 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 17 Feb 2016 16:16:34 +0000 (16:16 +0000)
commitd779d8d771c0a4c3d7bc38ac49bfed3ea3a2e6ed
treec736eabe8a65ea314172e9ea4668a8e348dab3ea
parent1a708780f3d4b431996d118df4e448b4f2a7942e
parenta001ce31bc2bcf875a39b5fb22dae49120293b42
Merge commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42'

* commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42':
  hwcontext: add a VDPAU implementation

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