diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 16:34:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 16:34:12 +0200 |
| commit | 9c943e077bfc23ba8d2e76a17fef7acbab4dd706 (patch) | |
| tree | 62bba1edfa79d9b614746ba9f620a0ca51d72638 /libavcodec/qsvenc.h | |
| parent | f929081f2e64d979fd8c58b17705e9554f99baf9 (diff) | |
| parent | 69b92f1b99f3f210be19ee6ec06f6c0de1733031 (diff) | |
Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'
* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031':
qsvenc: properly handle asynchronous encoding
Conflicts:
libavcodec/qsvenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/qsvenc.h')
| -rw-r--r-- | libavcodec/qsvenc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 4789675290..19be2aa448 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -29,6 +29,7 @@ #include <mfx/mfxvideo.h> #include "libavutil/avutil.h" +#include "libavutil/fifo.h" #include "avcodec.h" #include "qsv_internal.h" @@ -51,6 +52,8 @@ typedef struct QSVEncContext { mfxExtCodingOption extco; mfxExtBuffer *extparam[1]; + AVFifoBuffer *async_fifo; + // options set by the caller int async_depth; int idr_interval; |