This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 5f69124aaaed9f7e01dad8d849577826e7a5b20c Author: younengxiao <[email protected]> AuthorDate: Mon Aug 17 16:33:19 2026 -0400 Commit: Tong Wu <[email protected]> CommitDate: Fri Aug 21 08:25:47 2026 +0000 avcodec/vaapi_encode: remove duplicate FLAG_TIMESTAMP_NO_DELAY Use the shared FF_HW_FLAG_TIMESTAMP_NO_DELAY flag from hw_base_encode.h instead of VAAPI's own private definition with the same value and semantics. Signed-off-by: younengxiao <[email protected]> --- libavcodec/vaapi_encode.c | 2 +- libavcodec/vaapi_encode.h | 4 ---- libavcodec/vaapi_encode_av1.c | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 0e50602e1f..90c8ed6662 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -806,7 +806,7 @@ static int vaapi_encode_output(AVCodecContext *avctx, base_pic->display_order, base_pic->encode_order); ff_hw_base_encode_set_output_property(base_ctx, avctx, (FFHWBaseEncodePicture*)base_pic, pkt_ptr, - ctx->codec->flags & FLAG_TIMESTAMP_NO_DELAY); + ctx->codec->flags & FF_HW_FLAG_TIMESTAMP_NO_DELAY); end: av_refstruct_unref(&pic->output_buffer_ref); diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 1fa1e99a31..ecef8cd762 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -37,10 +37,6 @@ struct VAAPIEncodeType; struct VAAPIEncodePicture; -// Codec output packet without timestamp delay, which means the -// output packet has same PTS and DTS. -#define FLAG_TIMESTAMP_NO_DELAY 1 << 6 - enum { MAX_CONFIG_ATTRIBUTES = 4, MAX_GLOBAL_PARAMS = 4, diff --git a/libavcodec/vaapi_encode_av1.c b/libavcodec/vaapi_encode_av1.c index 9d837f5c6b..b70f17580f 100644 --- a/libavcodec/vaapi_encode_av1.c +++ b/libavcodec/vaapi_encode_av1.c @@ -847,7 +847,7 @@ static const VAAPIEncodeProfile vaapi_encode_av1_profiles[] = { static const VAAPIEncodeType vaapi_encode_type_av1 = { .profiles = vaapi_encode_av1_profiles, - .flags = FF_HW_FLAG_B_PICTURES | FLAG_TIMESTAMP_NO_DELAY, + .flags = FF_HW_FLAG_B_PICTURES | FF_HW_FLAG_TIMESTAMP_NO_DELAY, .default_quality = 25, .get_encoder_caps = &vaapi_encode_av1_get_encoder_caps, -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
