diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-26 08:45:42 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-06-01 11:36:30 +0300 |
| commit | 08d006f5a8ae0faef76d3dccea699c3af3db5b63 (patch) | |
| tree | 314a34053f2d912ecd14240193b3269d143faf5a | |
| parent | 674b79148ff29f40cbd569f5585bf99c71204bf5 (diff) | |
| download | ffmpeg-08d006f5a8ae0faef76d3dccea699c3af3db5b63.tar.gz | |
h264: Fix HWACCEL_MAX for D3D11
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/h264_slice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index a63f45ad20..45612852b9 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) |