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/h264_slice.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/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 2064496775..738c359701 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -935,6 +935,9 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) #if CONFIG_H264_DXVA2_HWACCEL *fmt++ = AV_PIX_FMT_DXVA2_VLD; #endif +#if CONFIG_H264_D3D11VA_HWACCEL + *fmt++ = AV_PIX_FMT_D3D11VA_VLD; +#endif #if CONFIG_H264_VAAPI_HWACCEL *fmt++ = AV_PIX_FMT_VAAPI_VLD; #endif |