diff options
| author | Mark Thompson <sw@jkqxz.net> | 2016-10-21 20:57:12 +0300 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2016-10-31 22:23:40 +0300 |
| commit | 1f26a231bb065276cd80ce02957c759f3197edfa (patch) | |
| tree | af9b071bab766b804e7b989b03873a01d3ed05fc /libavcodec/qsvenc.h | |
| parent | 309fe16a126c6c00cc60070de3190cf23f5570fb (diff) | |
qsv: Merge libav implementation
Merged as-at libav 398f015, and therefore includes outstanding
skipped merges 04b17ff and 130e1f1.
All features not in libav are preserved, and no options change.
Diffstat (limited to 'libavcodec/qsvenc.h')
| -rw-r--r-- | libavcodec/qsvenc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 2d7bd326f3..361d9333d8 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -42,6 +42,7 @@ #define QSV_HAVE_BREF_TYPE QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_LA QSV_VERSION_ATLEAST(1, 7) +#define QSV_HAVE_LA_DS QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_LA_HRD QSV_VERSION_ATLEAST(1, 11) #define QSV_HAVE_ICQ QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_VCM QSV_VERSION_ATLEAST(1, 8) @@ -79,11 +80,10 @@ typedef struct QSVEncContext { QSVFrame *work_frames; mfxSession session; - QSVSession internal_qs; + mfxSession internal_session; int packet_size; int width_align; - int height_align; mfxVideoParam param; mfxFrameAllocRequest req; @@ -104,6 +104,8 @@ typedef struct QSVEncContext { AVFifoBuffer *async_fifo; + QSVFramesContext frames_ctx; + // options set by the caller int async_depth; int idr_interval; |