diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 11:52:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 11:53:14 +0200 |
| commit | 7871eb43616776626ec9f9075b6d0a8cf73d159e (patch) | |
| tree | f9a88703414cd33e32c5f682974d8b4f96837b92 /libavcodec/qsvenc.h | |
| parent | 587980eb7a1f4b0228204aa846b72dc761e49779 (diff) | |
| parent | 66acb76bb0492b263215ca9b4d927a7be39ace02 (diff) | |
Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'
* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
lavc: add Intel libmfx-based HEVC encoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsv.c
libavcodec/qsvenc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 9f7f8ccfa5..530754cf1e 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -42,6 +42,7 @@ typedef struct QSVEncContext { mfxSession internal_session; int packet_size; + int width_align; mfxVideoParam param; mfxFrameAllocRequest req; @@ -56,6 +57,8 @@ typedef struct QSVEncContext { int preset; int avbr_accuracy; int avbr_convergence; + + char *load_plugins; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q); |