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/pixfmt.h | |
| 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/pixfmt.h')
| -rw-r--r-- | libavutil/pixfmt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index b1056d9504..3ddd30f0d8 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -258,6 +258,8 @@ enum AVPixelFormat { */ AV_PIX_FMT_MMAL, + AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer + #ifndef AV_PIX_FMT_ABI_GIT_MASTER AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian |