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 /libavutil/pixdesc.c | |
| parent | 9aabc926ca14faf240d078c7e428045b62018c8b (diff) | |
| parent | d8039ef8d221ea273aa4f1e62e5df21bf618c772 (diff) | |
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 'libavutil/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 5086edc5e7..32dc4b80ab 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1586,6 +1586,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, + [AV_PIX_FMT_D3D11VA_VLD] = { + .name = "d3d11va_vld", + .log2_chroma_w = 1, + .log2_chroma_h = 1, + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, [AV_PIX_FMT_DXVA2_VLD] = { .name = "dxva2_vld", .log2_chroma_w = 1, |