diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 01:06:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 01:22:22 +0200 |
| commit | c6eee3120a594cf25feb892f952a409a512d182e (patch) | |
| tree | dfadf4547a680823f6805011d1bcf6077a9ce121 /ffmpeg_opt.c | |
| parent | 9c6eef6f5fcfaa67c0d9b01e44434e4c26538f96 (diff) | |
| parent | 35177ba77ff60a8b8839783f57e44bcc4214507a (diff) | |
| download | ffmpeg-c6eee3120a594cf25feb892f952a409a512d182e.tar.gz | |
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
avconv: add support for DXVA2 decoding
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index c60d77686a..25968f4f6a 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -67,6 +67,9 @@ const HWAccel hwaccels[] = { #if HAVE_VDPAU_X11 { "vdpau", vdpau_init, HWACCEL_VDPAU, AV_PIX_FMT_VDPAU }, #endif +#if CONFIG_DXVA2 + { "dxva2", dxva2_init, HWACCEL_DXVA2, AV_PIX_FMT_DXVA2_VLD }, +#endif { 0 }, }; |