[FFmpeg-cvslog] h264: Fix HWACCEL_MAX for D3D11

Michael Niedermayer git at videolan.org
Mon Jun 1 17:09:09 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 26 08:45:42 2015 +0200| [08d006f5a8ae0faef76d3dccea699c3af3db5b63] | committer: Martin Storsjö

h264: Fix HWACCEL_MAX for D3D11

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08d006f5a8ae0faef76d3dccea699c3af3db5b63
---

 libavcodec/h264_slice.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index a63f45a..4561285 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -812,6 +812,7 @@ static void init_scan_tables(H264Context *h)
 static enum AVPixelFormat get_pixel_format(H264Context *h)
 {
 #define HWACCEL_MAX (CONFIG_H264_DXVA2_HWACCEL + \
+                     CONFIG_H264_D3D11VA_HWACCEL + \
                      CONFIG_H264_VAAPI_HWACCEL + \
                      (CONFIG_H264_VDA_HWACCEL * 2) + \
                      CONFIG_H264_VDPAU_HWACCEL)



More information about the ffmpeg-cvslog mailing list