Commit fa70af7c by ziyue

移动FFmpeg相关代码

parent 6f8ff98a
...@@ -8,7 +8,9 @@ ...@@ -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) { ...@@ -425,3 +427,5 @@ void TaskManager::onThreadRun(const string &name) {
} }
InfoL << name << " exited!"; InfoL << name << " exited!";
} }
#endif//ENABLE_FFMPEG
\ No newline at end of file
...@@ -14,6 +14,8 @@ ...@@ -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: ...@@ -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_ */
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论