diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-17 16:16:34 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-17 16:16:34 +0000 |
| commit | d779d8d771c0a4c3d7bc38ac49bfed3ea3a2e6ed (patch) | |
| tree | c736eabe8a65ea314172e9ea4668a8e348dab3ea /libavutil/hwcontext.c | |
| parent | 1a708780f3d4b431996d118df4e448b4f2a7942e (diff) | |
| parent | a001ce31bc2bcf875a39b5fb22dae49120293b42 (diff) | |
| download | ffmpeg-streaming-d779d8d771c0a4c3d7bc38ac49bfed3ea3a2e6ed.zip ffmpeg-streaming-d779d8d771c0a4c3d7bc38ac49bfed3ea3a2e6ed.tar.gz | |
Merge commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42'
* commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42':
hwcontext: add a VDPAU implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/hwcontext.c')
| -rw-r--r-- | libavutil/hwcontext.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 05c50a4..200a10e 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -29,6 +29,9 @@ #include "pixfmt.h" static const HWContextType *hw_table[] = { +#if CONFIG_VDPAU + &ff_hwcontext_type_vdpau, +#endif NULL, }; |
