summaryrefslogtreecommitdiff
path: root/libavcodec/qsvdec.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-11-14 15:19:51 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-11-14 15:19:51 +0100
commit220e77391552a61d515a1d8c2b17afd876958613 (patch)
treec368e03a35fe4dfd83767e6300dcb6c1fa5b4326 /libavcodec/qsvdec.h
parent1bc6cdf2fcbd3caea7b78d0a617c6e338606d756 (diff)
parentce320cf1c4daab3e2e3726ed7d2e879d10f7b991 (diff)
Merge commit 'ce320cf1c4daab3e2e3726ed7d2e879d10f7b991'
* commit 'ce320cf1c4daab3e2e3726ed7d2e879d10f7b991': qsvdec: use the same mfxFrameInfo for allocating frames that was passed to DECODE_Init Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/qsvdec.h')
-rw-r--r--libavcodec/qsvdec.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h
index 01f4cf99f4..41fb71682c 100644
--- a/libavcodec/qsvdec.h
+++ b/libavcodec/qsvdec.h
@@ -57,6 +57,7 @@ typedef struct QSVContext {
AVCodecContext *avctx_internal;
enum AVPixelFormat orig_pix_fmt;
uint32_t fourcc;
+ mfxFrameInfo frame_info;
// options set by the caller
int async_depth;