This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 1c2e63045641d40a11400dd130763f24b6d690b0 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Wed Mar 11 07:09:50 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Jun 23 19:15:57 2026 +0200 avcodec/nvenc_h264: Remove FF_API_NVENC_H264_MAIN I.e. switch to high profile by default. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/nvenc_h264.c | 4 ---- libavcodec/version_major.h | 1 - 2 files changed, 5 deletions(-) diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 2fbd1cad87..6def749f2c 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -57,11 +57,7 @@ static const AVOption options[] = { { "ull", "Ultra low latency", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY }, 0, 0, VE, .unit = "tune" }, { "lossless", "Lossless", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_LOSSLESS }, 0, 0, VE, .unit = "tune" }, #endif -#if FF_API_NVENC_H264_MAIN - { "profile", "Set the encoding profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = NV_ENC_H264_PROFILE_MAIN }, NV_ENC_H264_PROFILE_BASELINE, NV_ENC_H264_PROFILE_HIGH_444P, VE, .unit = "profile" }, -#else { "profile", "Set the encoding profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = NV_ENC_H264_PROFILE_HIGH }, NV_ENC_H264_PROFILE_BASELINE, NV_ENC_H264_PROFILE_HIGH_444P, VE, .unit = "profile" }, -#endif { "baseline", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_H264_PROFILE_BASELINE }, 0, 0, VE, .unit = "profile" }, { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_H264_PROFILE_MAIN }, 0, 0, VE, .unit = "profile" }, { "high", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_H264_PROFILE_HIGH }, 0, 0, VE, .unit = "profile" }, diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 633e60a8b0..bce7be035c 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -41,6 +41,5 @@ #define FF_API_INTRA_DC_PRECISION (LIBAVCODEC_VERSION_MAJOR < 63) #define FF_API_MJPEG_EXTERN_HUFF (LIBAVCODEC_VERSION_MAJOR < 63) -#define FF_API_NVENC_H264_MAIN (LIBAVCODEC_VERSION_MAJOR < 63) #endif /* AVCODEC_VERSION_MAJOR_H */ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
