Merge commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba'

[ffmpeg] / libavcodec / qsvenc.h

diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
index 806dc0608bcf13d1a625042fe4477179ba8ca1fc..2d7bd326f33ad141bdcb5e40a759e17849dbd9b4 100644 (file)
--- 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;