git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
28fa58c
)
dxva2: Add ifdefs around structs that might not be available
author
Martin Storsjö
<martin@martin.st>
Mon, 1 Jun 2015 09:16:51 +0000
(12:16 +0300)
committer
Martin Storsjö
<martin@martin.st>
Mon, 1 Jun 2015 20:04:46 +0000
(23:04 +0300)
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/dxva2.c
patch
|
blob
|
history
diff --git
a/libavcodec/dxva2.c
b/libavcodec/dxva2.c
index
76a9d54
..
d4ac98d
100644
(file)
--- 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;