Skip to content

build(deps): Update to FFmpeg 8.0 branch #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
[submodule "third-party/FFmpeg/FFmpeg"]
path = third-party/FFmpeg/FFmpeg
url = https://github.com/FFmpeg/FFmpeg.git
branch = release/7.1
branch = release/8.0
[submodule "third-party/FFmpeg/SVT-AV1"]
path = third-party/FFmpeg/SVT-AV1
url = https://github.com/LizardByte-infrastructure/SVT-AV1.git
Expand Down
2 changes: 1 addition & 1 deletion cmake/ffmpeg/ffmpeg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if(BUILD_FFMPEG_AMF)
endif()
if(BUILD_FFMPEG_MF)
list(APPEND FFMPEG_EXTRA_CONFIGURE
--enable-encoder=h264_mf,hevc_mf
--enable-encoder=h264_mf,hevc_mf,av1_mf
--enable-mediafoundation
)
endif()
Expand Down
189 changes: 0 additions & 189 deletions patches/FFmpeg/FFmpeg/AMF/01-amf-colorspace.patch

This file was deleted.

35 changes: 35 additions & 0 deletions patches/FFmpeg/FFmpeg/AMF/01-amf-outputdelay.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From e0b38ef1a012ecdf684f80e215970a5cf8ccb5e2 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <[email protected]>
Date: Sat, 9 Aug 2025 20:40:17 -0500
Subject: [PATCH] avcodec/amfenc: fix output delayed by one frame

Signed-off-by: Cameron Gutman <[email protected]>
---
libavcodec/amfenc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
index b16b642e4c..fb41aef90a 100644
--- a/libavcodec/amfenc.c
+++ b/libavcodec/amfenc.c
@@ -634,7 +634,7 @@ static int amf_submit_frame(AVCodecContext *avctx, AVFrame *frame, AMFSurface
ret = av_fifo_write(ctx->timestamp_list, &frame->pts, 1);
if (ret < 0)
return ret;
- if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames + 1)
+ if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames)
return AVERROR(EAGAIN); // if frame just submiited - don't poll or wait
}
return 0;
@@ -700,7 +700,7 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt)
if(ret != AVERROR_EOF){
av_frame_free(&frame);
if(ret == AVERROR(EAGAIN)){
- if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames + 1) // too soon to poll
+ if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames) // too soon to poll
return ret;
}
}
--
2.50.1.windows.1

122 changes: 0 additions & 122 deletions patches/FFmpeg/FFmpeg/AMF/02-idr-on-amf.patch

This file was deleted.

Loading
Loading