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

Michael Niedermayer git at videolan.org
Tue May 26 05:24:22 CEST 2015


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

avcodec/hevc: 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=688147cfe2d14bf24d185eb7299be01e511582ba
---

 libavcodec/hevc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 028ece8..fd6370b 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -328,7 +328,7 @@ static void export_stream_params(AVCodecContext *avctx,
 
 static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fmt)
 {
-    #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL)
+    #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL + CONFIG_HEVC_D3D11VA_HWACCEL)
     enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts;
     int ret, i;
 



More information about the ffmpeg-cvslog mailing list