diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 17:13:35 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 17:13:35 +0300 |
commit | f929081f2e64d979fd8c58b17705e9554f99baf9 (patch) | |
tree | 2d0ebbfdefb78f3921f4c4a425a80e3f548a1a3e /libavcodec/qsvdec.h | |
parent | 7093e215d02ed0dc9632f82ac8ccec432d29cd35 (diff) | |
parent | f5c4d38c78347b09478e21a661befff4b2d44643 (diff) |
Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
qsvdec: properly handle asynchronous decoding
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/qsvdec.h')
-rw-r--r-- | libavcodec/qsvdec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h index 4184d3391a..5b40bb1734 100644 --- a/libavcodec/qsvdec.h +++ b/libavcodec/qsvdec.h @@ -28,6 +28,7 @@ #include <mfx/mfxvideo.h> +#include "libavutil/fifo.h" #include "libavutil/frame.h" #include "libavutil/pixfmt.h" @@ -47,6 +48,8 @@ typedef struct QSVContext { */ QSVFrame *work_frames; + AVFifoBuffer *async_fifo; + // options set by the caller int async_depth; int iopattern; |