Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-05 19:08:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

移动FFmpeg相关代码

Browse Source
This commit is contained in:
ziyue
2022-05-25 14:41:08 +08:00
parent 6f8ff98afd
commit fa70af7cce
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
player/FFMpegDecoder.cpp → src/Codec/Transcode.cpp
View File

@@ -8,7 +8,9 @@
* may be found in the AUTHORS file in the root of the source tree. * may be found in the AUTHORS file in the root of the source tree.
*/ */
#include "FFMpegDecoder.h" #if defined(ENABLE_FFMPEG)
#include "Transcode.h"
#define MAX_DELAY_SECOND 3 #define MAX_DELAY_SECOND 3
using namespace std; using namespace std;
@@ -425,3 +427,5 @@ void TaskManager::onThreadRun(const string &name) {
} }
InfoL << name << " exited!"; InfoL << name << " exited!";
} }
#endif//ENABLE_FFMPEG

3
player/FFMpegDecoder.h → src/Codec/Transcode.h
View File

@@ -14,6 +14,8 @@
#include "Util/TimeTicker.h" #include "Util/TimeTicker.h"
#include "Common/MediaSink.h" #include "Common/MediaSink.h"
#if defined(ENABLE_FFMPEG)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -113,6 +115,7 @@ private:
mediakit::FrameMerger _merger { mediakit::FrameMerger::h264_prefix }; mediakit::FrameMerger _merger { mediakit::FrameMerger::h264_prefix };
}; };
#endif// ENABLE_FFMPEG
#endif /* FFMpegDecoder_H_ */ #endif /* FFMpegDecoder_H_ */