diff options
| author | Mark Thompson <sw@jkqxz.net> | 2016-10-21 18:57:12 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2016-10-31 19:23:40 +0000 |
| commit | 1f26a231bb065276cd80ce02957c759f3197edfa (patch) | |
| tree | af9b071bab766b804e7b989b03873a01d3ed05fc /libavcodec/qsvenc_h264.c | |
| parent | 309fe16a126c6c00cc60070de3190cf23f5570fb (diff) | |
| download | ffmpeg-1f26a231bb065276cd80ce02957c759f3197edfa.tar.gz | |
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_h264.c')
| -rw-r--r-- | libavcodec/qsvenc_h264.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index f5b01bb992..7ff1a98b4f 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -111,8 +111,7 @@ static const AVOption options[] = { { "look_ahead", "Use VBR algorithm with look ahead", OFFSET(qsv.look_ahead), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, { "look_ahead_depth", "Depth of look ahead in number frames", OFFSET(qsv.look_ahead_depth), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 100, VE }, #endif - -#if QSV_VERSION_ATLEAST(1,8) +#if QSV_HAVE_LA_DS { "look_ahead_downsampling", NULL, OFFSET(qsv.look_ahead_downsampling), AV_OPT_TYPE_INT, { .i64 = MFX_LOOKAHEAD_DS_UNKNOWN }, MFX_LOOKAHEAD_DS_UNKNOWN, MFX_LOOKAHEAD_DS_2x, VE, "look_ahead_downsampling" }, { "unknown" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_LOOKAHEAD_DS_UNKNOWN }, INT_MIN, INT_MAX, VE, "look_ahead_downsampling" }, { "off" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_LOOKAHEAD_DS_OFF }, INT_MIN, INT_MAX, VE, "look_ahead_downsampling" }, |