From aeea0feedc9e25294962be52c5e1dc7e34fdb006 Mon Sep 17 00:00:00 2001
From: WYY <1062587448@qq.com>
Date: 星期四, 27 二月 2025 21:22:53 +0800
Subject: [PATCH] v3.04
---
Client/董澎韬/code/qffmpeg.h | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git "a/Client/\350\221\243\346\276\216\351\237\254/code/qffmpeg.h" "b/Client/\350\221\243\346\276\216\351\237\254/code/qffmpeg.h"
index 9085958..9f92d44 100644
--- "a/Client/\350\221\243\346\276\216\351\237\254/code/qffmpeg.h"
+++ "b/Client/\350\221\243\346\276\216\351\237\254/code/qffmpeg.h"
@@ -10,12 +10,19 @@
//寮曞叆ffmpeg澶存枃浠�
extern "C"
{
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h> //瀹炵幇闊宠棰戠殑缂栬В鐮佸姛鑳�
+#include <libavformat/avformat.h> //瀹炵幇闊宠棰戞枃浠剁殑璇诲彇鍜屽啓鍏ュ姛鑳斤紝鏀寔澶氱闊宠棰戞牸寮�
#include <libavfilter/avfilter.h>
#include <libswscale/swscale.h>
#include <libavutil/frame.h>
+#include <libavutil/imgutils.h>
}
+
+// 寮曞叆SDL2澶存枃浠�
+//extern "C"
+//{
+// #include "SDL.h"
+//}
#include <QObject>
#include <QMutex>
@@ -53,10 +60,13 @@
int videoStreamIndex;
int index;
+ // SDL鐩稿叧
+// SDL_Window *sdlWindow;
+// SDL_Renderer *sdlRenderer;
+// SDL_Texture *sdlTexture;
+
signals:
void GetImage(const QImage &image,int x); // 鍙戦�佽В鐮佸悗鐨勫浘鍍忎俊鍙�
-
-public slots:
};
--
Gitblit v1.8.0