diff options
| author | James Almer <jamrial@gmail.com> | 2018-09-02 19:10:49 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-09-02 19:10:49 -0300 |
| commit | b4ca32414ea28ad29b4bd387c298f5a676dace2a (patch) | |
| tree | 87b807ded61bb56e9eb08cd805f56369b412bc65 | |
| parent | fb4a12cda4033f2f3d3d1039739f6e0e6f9afb82 (diff) | |
| parent | 35ed7f93dbc72d733e454ae464b1324f38af62a0 (diff) | |
| download | ffmpeg-b4ca32414ea28ad29b4bd387c298f5a676dace2a.tar.gz | |
Merge commit '35ed7f93dbc72d733e454ae464b1324f38af62a0'
* commit '35ed7f93dbc72d733e454ae464b1324f38af62a0':
qsvenc: Add an option to disable MFE mode
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/qsvenc_h264.c | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 7aa65e96bc..b107b87f34 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -146,7 +146,9 @@ static const AVOption options[] = { { "aud", "Insert the Access Unit Delimiter NAL", OFFSET(qsv.aud), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE}, #if QSV_HAVE_MF - { "mfmode", "Multi-Frame Mode", OFFSET(qsv.mfmode), AV_OPT_TYPE_INT, { .i64 = MFX_MF_AUTO }, 0, INT_MAX, VE }, + { "mfmode", "Multi-Frame Mode", OFFSET(qsv.mfmode), AV_OPT_TYPE_INT, { .i64 = MFX_MF_AUTO }, MFX_MF_DEFAULT, MFX_MF_AUTO, VE, "mfmode"}, + { "off" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_DISABLED }, INT_MIN, INT_MAX, VE, "mfmode" }, + { "auto" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_AUTO }, INT_MIN, INT_MAX, VE, "mfmode" }, #endif { NULL }, diff --git a/libavcodec/version.h b/libavcodec/version.h index b38284a743..ce3349019c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 27 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |