diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 22:58:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 23:06:32 +0200 |
| commit | 14617e3a739ea23e8da9adcdca4418f2b14a3956 (patch) | |
| tree | dac93fcbac626cf67282e92da13078f806c10fe7 /libavcodec/dxva2.c | |
| parent | 7fc6545d5d7301196d1c23a45a24a9707bac0060 (diff) | |
| parent | 172b2cee17a3779c114ba065dd7b25dcf61e408f (diff) | |
| download | ffmpeg-streaming-14617e3a739ea23e8da9adcdca4418f2b14a3956.zip ffmpeg-streaming-14617e3a739ea23e8da9adcdca4418f2b14a3956.tar.gz | |
Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'
* commit '172b2cee17a3779c114ba065dd7b25dcf61e408f':
dxva2: Add ifdefs around structs that might not be available
Conflicts:
libavcodec/dxva2.c
See: 94d07b314aa516284cc21ea720d4a305f881b6c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxva2.c')
| -rw-r--r-- | libavcodec/dxva2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 4eb5236..f31c5e2 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -135,7 +135,9 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, #if CONFIG_D3D11VA D3D11_VIDEO_DECODER_BUFFER_DESC buffer11[4]; #endif +#if CONFIG_DXVA2 DXVA2_DecodeBufferDesc buffer2[4]; +#endif DECODER_BUFFER_DESC *buffer = NULL, *buffer_slice = NULL; int result, runs = 0; HRESULT hr; |
