From fa70af7cce02fc21a8fe416c1cbcdf4eb9c28d55 Mon Sep 17 00:00:00 2001 From: ziyue <1213642868@qq.com> Date: Wed, 25 May 2022 14:41:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8FFmpeg=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- player/FFMpegDecoder.cpp => src/Codec/Transcode.cpp | 6 +++++- player/FFMpegDecoder.h => src/Codec/Transcode.h | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) rename player/FFMpegDecoder.cpp => src/Codec/Transcode.cpp (99%) rename player/FFMpegDecoder.h => src/Codec/Transcode.h (98%) diff --git a/player/FFMpegDecoder.cpp b/src/Codec/Transcode.cpp similarity index 99% rename from player/FFMpegDecoder.cpp rename to src/Codec/Transcode.cpp index 9d1f6560..26a0fb95 100644 --- a/player/FFMpegDecoder.cpp +++ b/src/Codec/Transcode.cpp @@ -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 \ No newline at end of file diff --git a/player/FFMpegDecoder.h b/src/Codec/Transcode.h similarity index 98% rename from player/FFMpegDecoder.h rename to src/Codec/Transcode.h index de251f50..9a81e01e 100644 --- a/player/FFMpegDecoder.h +++ b/src/Codec/Transcode.h @@ -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_ */