diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-25 22:02:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-25 22:24:34 +0200 |
| commit | 947b74ee7da7984b666a478164917e42d4f4592d (patch) | |
| tree | c2de5e9e2059cf14329979e77981819cc5cee7d3 /libavcodec/vc1dec.c | |
| parent | 9aabc926ca14faf240d078c7e428045b62018c8b (diff) | |
| parent | d8039ef8d221ea273aa4f1e62e5df21bf618c772 (diff) | |
| download | ffmpeg-947b74ee7da7984b666a478164917e42d4f4592d.tar.gz | |
Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'
* commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772':
D3D11va: add a Direct3D11 video decoder similar to DXVA2
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dxva2_vc1.c
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index d39f344102..eab6792f36 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1074,6 +1074,9 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { #if CONFIG_VC1_DXVA2_HWACCEL AV_PIX_FMT_DXVA2_VLD, #endif +#if CONFIG_VC1_D3D11VA_HWACCEL + AV_PIX_FMT_D3D11VA_VLD, +#endif #if CONFIG_VC1_VAAPI_HWACCEL AV_PIX_FMT_VAAPI_VLD, #endif |