diff options
| author | Steve Lhomme <robux4@videolabs.io> | 2015-05-11 10:52:47 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-05-25 11:47:08 +0200 |
| commit | d8039ef8d221ea273aa4f1e62e5df21bf618c772 (patch) | |
| tree | e2d844c800e9e01d0fb5d755aa9df1cb53051840 /libavutil | |
| parent | 4e17946f10d39eec6cc03fb249ae8147373141b6 (diff) | |
| download | ffmpeg-d8039ef8d221ea273aa4f1e62e5df21bf618c772.tar.gz | |
D3D11va: add a Direct3D11 video decoder similar to DXVA2
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/pixdesc.c | 6 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index ea432f9079..c2c0157e7a 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1333,6 +1333,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, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index e21100f1f7..360015ca1f 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -220,6 +220,8 @@ enum AVPixelFormat { */ AV_PIX_FMT_MMAL, + AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer + AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions #if FF_API_PIX_FMT diff --git a/libavutil/version.h b/libavutil/version.h index 9c45e0eed9..13bb6f0ab3 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -54,7 +54,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 12 +#define LIBAVUTIL_VERSION_MINOR 13 #define LIBAVUTIL_VERSION_MICRO 1 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |