Module: libav
Branch: master
Commit: bb65eb62991e5165b9fad2702a8954a1fe3c6f1f
Author: Ben Chang <b...@nvidia.com>
Committer: Luca Barbato <lu_z...@gentoo.org>
Date: Sat Jun 24 12:10:10 2017 +0000
nvenc: Add an explicit auto alias
---
libavcodec/nvenc_h264.c | 1 +
libavcodec/nvenc_hevc.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c
index f7e5cd0..1c9e07a 100644
--- a/libavcodec/nvenc_h264.c
+++ b/libavcodec/nvenc_h264.c
@@ -47,6 +47,7 @@ static const AVOption options[] = {
{ "high_444", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_H264_PROFILE_HIGH_444 }, 0, 0,
VE, "profile" },
{ "constrained_high", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_H264_PROFILE_CONSTRAINED_HIGH }, 0, 0,
VE, "profile" },
{ "level", "Set the encoding level restriction", OFFSET(level),
AV_OPT_TYPE_INT, { .i64 = NV_ENC_LEVEL_AUTOSELECT },
NV_ENC_LEVEL_AUTOSELECT, NV_ENC_LEVEL_H264_51, VE, "level" },
+ { "auto", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AUTOSELECT }, 0, 0, VE, "level" },
{ "1.0", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_H264_1 }, 0, 0, VE, "level" },
{ "1.b", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_H264_1b }, 0, 0, VE, "level" },
{ "1.1", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_H264_11 }, 0, 0, VE, "level" },
diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c
index 9102d8a..a13db98 100644
--- a/libavcodec/nvenc_hevc.c
+++ b/libavcodec/nvenc_hevc.c
@@ -47,6 +47,7 @@ static const AVOption options[] = {
{ "rext", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_HEVC_PROFILE_REXT }, 0, 0, VE, "profile" },
#endif /* NVENCAPI_MAJOR_VERSION >= 7 */
{ "level", "Set the encoding level restriction", OFFSET(level),
AV_OPT_TYPE_INT, { .i64 = NV_ENC_LEVEL_AUTOSELECT },
NV_ENC_LEVEL_AUTOSELECT, NV_ENC_LEVEL_HEVC_62, VE, "level" },
+ { "auto", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AUTOSELECT }, 0, 0, VE, "level" },
{ "1.0", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_HEVC_1 }, 0, 0, VE, "level" },
{ "2.0", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_HEVC_2 }, 0, 0, VE, "level" },
{ "2.1", "", 0,
AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_HEVC_21 }, 0, 0, VE, "level" },
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
