[FFmpeg-cvslog] dxva2: Add ifdefs around structs that might not be available

Martin Storsjö git at videolan.org
Mon Jun 1 23:07:43 CEST 2015


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Jun  1 12:16:51 2015 +0300| [172b2cee17a3779c114ba065dd7b25dcf61e408f] | committer: Martin Storsjö

dxva2: Add ifdefs around structs that might not be available

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

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

 libavcodec/dxva2.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c
index 76a9d54..d4ac98d 100644
--- a/libavcodec/dxva2.c
+++ b/libavcodec/dxva2.c
@@ -132,8 +132,12 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame,
 {
     AVDXVAContext *ctx = avctx->hwaccel_context;
     unsigned               buffer_count = 0;
+#if CONFIG_D3D11VA
     D3D11_VIDEO_DECODER_BUFFER_DESC buffer11[4];
+#endif
+#if CONFIG_DXVA2
     DXVA2_DecodeBufferDesc          buffer2[4];
+#endif
     DECODER_BUFFER_DESC             *buffer,*buffer_slice;
     int result, runs = 0;
     HRESULT hr;



More information about the ffmpeg-cvslog mailing list