diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 16:51:45 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 16:51:45 +0000 |
| commit | c63da6e91630b72fa5916314910cb35e82331f70 (patch) | |
| tree | 14404ba40f2700a4e38eb81d34693a35e2a8b1bb /libavcodec/qsvenc.h | |
| parent | 32766877b4e1a7eeacfbca50c55d55ce8bb7b73d (diff) | |
| parent | 9cac1b4b4f1532fb2aeef54799285360656be5eb (diff) | |
| download | ffmpeg-c63da6e91630b72fa5916314910cb35e82331f70.tar.gz | |
Merge commit '9cac1b4b4f1532fb2aeef54799285360656be5eb'
* commit '9cac1b4b4f1532fb2aeef54799285360656be5eb':
qsvenc: Add private option to replace coder_type
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/qsvenc.h')
| -rw-r--r-- | libavcodec/qsvenc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 806dc0608b..2d7bd326f3 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -69,6 +69,7 @@ { "adaptive_i", "Adaptive I-frame placement", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "adaptive_b", "Adaptive B-frame placement", OFFSET(qsv.adaptive_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "b_strategy", "Strategy to choose between I/P/B-frames", OFFSET(qsv.b_strategy), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ +{ "cavlc", "Enable CAVLC", OFFSET(qsv.cavlc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, \ typedef int SetEncodeCtrlCB (AVCodecContext *avctx, const AVFrame *frame, mfxEncodeCtrl* enc_ctrl); @@ -129,6 +130,7 @@ typedef struct QSVEncContext { int adaptive_i; int adaptive_b; int b_strategy; + int cavlc; int int_ref_type; int int_ref_cycle_size; |