40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From ce5bf37d858e399e9a114fcb147d924d6ace42a1 Mon Sep 17 00:00:00 2001
|
|
From: chenguanglee <lichenguang@kylinos.cn>
|
|
Date: Fri, 22 Nov 2024 10:20:05 +0800
|
|
Subject: [PATCH] fix build error of ffmpeg-6.1.1
|
|
|
|
---
|
|
src/core/ffutil.cpp | 2 +-
|
|
src/core/ffutil.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/core/ffutil.cpp b/src/core/ffutil.cpp
|
|
index 5297a31..082cb36 100644
|
|
--- a/src/core/ffutil.cpp
|
|
+++ b/src/core/ffutil.cpp
|
|
@@ -21,7 +21,7 @@ extern "C"
|
|
|
|
FFUtil::FFUtil(QObject *parent) : QObject(parent)
|
|
{
|
|
- av_register_all();
|
|
+ //av_register_all();
|
|
m_videoTbr = new VideoThumbnailer;
|
|
m_videoTbr->setThumbnailSize(176);
|
|
pFormatCtx = nullptr;
|
|
diff --git a/src/core/ffutil.h b/src/core/ffutil.h
|
|
index cf3de29..7517f27 100644
|
|
--- a/src/core/ffutil.h
|
|
+++ b/src/core/ffutil.h
|
|
@@ -26,7 +26,7 @@ private:
|
|
VideoThumbnailer *m_videoTbr;
|
|
AVFormatContext *pFormatCtx;
|
|
AVCodecContext *pCodecCtx;
|
|
- AVCodec *pCodec;
|
|
+ const AVCodec *pCodec;
|
|
int videoStream;
|
|
int videoDuration;
|
|
|
|
--
|
|
2.43.0
|
|
|