[FFmpeg-cvslog] avcodec/h264: Fix HWACCEL_MAX for D3D11

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 26 05:08:32 2015 +0200| [1b236541a6b55da6ddc73fadd9a252c7e4bfb55f] | committer: Michael Niedermayer

avcodec/h264: Fix HWACCEL_MAX for D3D11

Found-by: philipl
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 738c359..80a387d 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -863,6 +863,7 @@ static void init_scan_tables(H264Context *h)
 static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
 {
 #define HWACCEL_MAX (CONFIG_H264_DXVA2_HWACCEL + \
+                     CONFIG_H264_D3D11VA_HWACCEL + \
                      CONFIG_H264_VAAPI_HWACCEL + \
                      (CONFIG_H264_VDA_HWACCEL * 2) + \
                      CONFIG_H264_VDPAU_HWACCEL)