mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-22 10:40:05 +08:00
移动FFmpeg相关代码
This commit is contained in:
parent
6f8ff98afd
commit
fa70af7cce
@ -8,7 +8,9 @@
|
||||
* 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
|
||||
|
||||
using namespace std;
|
||||
@ -425,3 +427,5 @@ void TaskManager::onThreadRun(const string &name) {
|
||||
}
|
||||
InfoL << name << " exited!";
|
||||
}
|
||||
|
||||
#endif//ENABLE_FFMPEG
|
@ -14,6 +14,8 @@
|
||||
#include "Util/TimeTicker.h"
|
||||
#include "Common/MediaSink.h"
|
||||
|
||||
#if defined(ENABLE_FFMPEG)
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
@ -113,6 +115,7 @@ private:
|
||||
mediakit::FrameMerger _merger { mediakit::FrameMerger::h264_prefix };
|
||||
};
|
||||
|
||||
#endif// ENABLE_FFMPEG
|
||||
#endif /* FFMpegDecoder_H_ */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user