Skip to content

Commit eaf2aa6

Browse files
committed
build(deps): Update to FFmpeg 8.0 branch
1 parent b5d763a commit eaf2aa6

14 files changed

+131
-637
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
[submodule "third-party/FFmpeg/FFmpeg"]
1818
path = third-party/FFmpeg/FFmpeg
1919
url = https://github.com/FFmpeg/FFmpeg.git
20-
branch = release/7.1
20+
branch = release/8.0
2121
[submodule "third-party/FFmpeg/SVT-AV1"]
2222
path = third-party/FFmpeg/SVT-AV1
2323
url = https://github.com/LizardByte-infrastructure/SVT-AV1.git

cmake/ffmpeg/ffmpeg.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if(BUILD_FFMPEG_AMF)
5252
endif()
5353
if(BUILD_FFMPEG_MF)
5454
list(APPEND FFMPEG_EXTRA_CONFIGURE
55-
--enable-encoder=h264_mf,hevc_mf
55+
--enable-encoder=h264_mf,hevc_mf,av1_mf
5656
--enable-mediafoundation
5757
)
5858
endif()

patches/FFmpeg/FFmpeg/AMF/01-amf-colorspace.patch

Lines changed: 0 additions & 189 deletions
This file was deleted.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From e0b38ef1a012ecdf684f80e215970a5cf8ccb5e2 Mon Sep 17 00:00:00 2001
2+
From: Cameron Gutman <[email protected]>
3+
Date: Sat, 9 Aug 2025 20:40:17 -0500
4+
Subject: [PATCH] avcodec/amfenc: fix output delayed by one frame
5+
6+
Signed-off-by: Cameron Gutman <[email protected]>
7+
---
8+
libavcodec/amfenc.c | 4 ++--
9+
1 file changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
12+
index b16b642e4c..fb41aef90a 100644
13+
--- a/libavcodec/amfenc.c
14+
+++ b/libavcodec/amfenc.c
15+
@@ -634,7 +634,7 @@ static int amf_submit_frame(AVCodecContext *avctx, AVFrame *frame, AMFSurface
16+
ret = av_fifo_write(ctx->timestamp_list, &frame->pts, 1);
17+
if (ret < 0)
18+
return ret;
19+
- if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames + 1)
20+
+ if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames)
21+
return AVERROR(EAGAIN); // if frame just submiited - don't poll or wait
22+
}
23+
return 0;
24+
@@ -700,7 +700,7 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt)
25+
if(ret != AVERROR_EOF){
26+
av_frame_free(&frame);
27+
if(ret == AVERROR(EAGAIN)){
28+
- if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames + 1) // too soon to poll
29+
+ if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames) // too soon to poll
30+
return ret;
31+
}
32+
}
33+
--
34+
2.50.1.windows.1
35+

patches/FFmpeg/FFmpeg/AMF/02-idr-on-amf.patch

Lines changed: 0 additions & 122 deletions
This file was deleted.

0 commit comments

Comments
 (0)