From f1712689010851cda8cfee7f42d1f8eca19efbd5 Mon Sep 17 00:00:00 2001 From: JackLau1222 <2366536135@qq.com> Date: Mon, 21 Oct 2024 07:45:35 +0800 Subject: [PATCH] fix the incompatibility issue of ffmpeg 5.0 and 5.1 --- bmf/c_modules/src/ffmpeg_encoder.cpp | 6 +++++- bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bmf/c_modules/src/ffmpeg_encoder.cpp b/bmf/c_modules/src/ffmpeg_encoder.cpp index c1bb730a..191ceab3 100644 --- a/bmf/c_modules/src/ffmpeg_encoder.cpp +++ b/bmf/c_modules/src/ffmpeg_encoder.cpp @@ -1478,7 +1478,11 @@ int CFFEncoder::init_codec(int idx, AVFrame *frame) { } } - out_stream->codec->time_base = enc_ctxs_[idx]->time_base; + /** + * @deprecated codec has been deprecated since ffmpeg 5.0 + * use out_stream->time_base instead of out_stream->codec->time_base. + */ + out_stream->time_base = enc_ctxs_[idx]->time_base; } out_stream->time_base = enc_ctxs_[idx]->time_base; diff --git a/bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h b/bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h index 2bd5cc33..bafadd81 100644 --- a/bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h +++ b/bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h @@ -36,6 +36,7 @@ extern "C" { #include #include #include +#include #include };