PR #20767 opened by Kacper Michajłow (kasper93) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20767 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20767.patch
From d57de8335282d99c6544009cacecb91044f8b7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]> Date: Mon, 27 Oct 2025 15:38:07 +0100 Subject: [PATCH 1/3] avcodec/d3d12va_encode: fix format specifier for HRESULT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kacper Michajłow <[email protected]> --- libavcodec/d3d12va_encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/d3d12va_encode.c b/libavcodec/d3d12va_encode.c index 4a8672a359..aa8a5982be 100644 --- a/libavcodec/d3d12va_encode.c +++ b/libavcodec/d3d12va_encode.c @@ -1511,7 +1511,7 @@ int ff_d3d12va_encode_init(AVCodecContext *avctx) format_info.Format = ((AVD3D12VAFramesContext *)base_ctx->input_frames->hwctx)->format; if (FAILED(ID3D12VideoDevice_CheckFeatureSupport(ctx->hwctx->device, D3D12_FEATURE_FORMAT_INFO, &format_info, sizeof(format_info)))) { - av_log(avctx, AV_LOG_ERROR, "Failed to query format plane count: 0x%x\n", hr); + av_log(avctx, AV_LOG_ERROR, "Failed to query format plane count: %#lx\n", hr); err = AVERROR_EXTERNAL; goto fail; } -- 2.49.1 From a6ccaa2eea1900676f975c1dd720638ea2ee828d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]> Date: Mon, 27 Oct 2025 15:38:47 +0100 Subject: [PATCH 2/3] avcodec/d3d12va_encode_h264: remove unused variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kacper Michajłow <[email protected]> --- libavcodec/d3d12va_encode_h264.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/d3d12va_encode_h264.c b/libavcodec/d3d12va_encode_h264.c index 560187b750..967544ea24 100644 --- a/libavcodec/d3d12va_encode_h264.c +++ b/libavcodec/d3d12va_encode_h264.c @@ -167,7 +167,6 @@ static int d3d12va_encode_h264_init_sequence_params(AVCodecContext *avctx) AVD3D12VAFramesContext *hwctx = base_ctx->input_frames->hwctx; H264RawSPS *sps = &priv->units.raw_sps; H264RawPPS *pps = &priv->units.raw_pps; - H264RawVUI *vui = &sps->vui; D3D12_VIDEO_ENCODER_PROFILE_H264 profile = D3D12_VIDEO_ENCODER_PROFILE_H264_MAIN; D3D12_VIDEO_ENCODER_LEVELS_H264 level = { 0 }; const AVPixFmtDescriptor *desc; @@ -341,7 +340,6 @@ static int d3d12va_encode_h264_configure(AVCodecContext *avctx) static int d3d12va_encode_h264_set_level(AVCodecContext *avctx) { D3D12VAEncodeContext *ctx = avctx->priv_data; - D3D12VAEncodeH264Context *priv = avctx->priv_data; int i; ctx->level.DataSize = sizeof(D3D12_VIDEO_ENCODER_LEVELS_H264); -- 2.49.1 From ccb1865a82c7bb1bc75a486bb0423355a2daa522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]> Date: Mon, 27 Oct 2025 15:39:14 +0100 Subject: [PATCH 3/3] avfilter/buffersink: move ret declaration to suppress unused warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kacper Michajłow <[email protected]> --- libavfilter/buffersink.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 183840a2bd..d9a124b455 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -167,7 +167,6 @@ int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, static av_cold int common_init(AVFilterContext *ctx) { BufferSinkContext *buf = ctx->priv; - int ret = 0; #if FF_API_BUFFERSINK_OPTS @@ -224,13 +223,11 @@ static av_cold int common_init(AVFilterContext *ctx) sizeof(*buf->channel_layouts) * 2); buf->nb_channel_layouts++; - ret = av_channel_layout_from_string(&buf->channel_layouts[buf->nb_channel_layouts - 1], cur); + int ret = av_channel_layout_from_string(&buf->channel_layouts[buf->nb_channel_layouts - 1], cur); if (ret < 0) { av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout: %s.\n", cur); return ret; } - if (ret < 0) - return ret; cur = next; } -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
