summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-26 05:08:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-26 05:23:29 +0200
commit1b236541a6b55da6ddc73fadd9a252c7e4bfb55f (patch)
treed5d10e0ca28c2f9850c108784bb21b30ebb91947
parent688147cfe2d14bf24d185eb7299be01e511582ba (diff)
avcodec/h264: Fix HWACCEL_MAX for D3D11
Found-by: philipl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264_slice.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 738c359701..80a387d79c 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)