diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-30 03:04:33 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-30 03:05:57 +0300 |
| commit | dde7b1d4857fa710113d1fc365bc4ea7707e3156 (patch) | |
| tree | 5cb0791a9c6126ef62a12f8fbe71487563518f87 /libavcodec/qsvenc.h | |
| parent | b0d9eab7f202f439b7c28e23ed1852abc814cd52 (diff) | |
| parent | b843b343d8a3210ae37a2342b1904a5bd1e5fc6e (diff) | |
Merge commit 'b843b343d8a3210ae37a2342b1904a5bd1e5fc6e'
* commit 'b843b343d8a3210ae37a2342b1904a5bd1e5fc6e':
qsvenc: cavlc option is only available for h264
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/qsvenc.h')
| -rw-r--r-- | libavcodec/qsvenc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 12e3444b75..5cfd17446d 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -70,7 +70,6 @@ { "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); |