Germany/hunting
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master-develop' of gitee.com:shenzhen-jiuyilian/ipc into master-develop

Browse Source
This commit is contained in:
Fancy code 2024-07-10 11:06:11 +08:00
commit 7bf75e7754
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/MediaBase/CMakeLists.txt
View File

@ -5,9 +5,9 @@ set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
include_directories(
./src
./include
# ${UTILS_SOURCE_PATH}/LinuxApi/include
${UTILS_SOURCE_PATH}/LinuxApi/include
${UTILS_SOURCE_PATH}/StatusCode/include
${UTILS_SOURCE_PATH}/ModBusCRC16/include
# ${UTILS_SOURCE_PATH}/ModBusCRC16/include
${UTILS_SOURCE_PATH}/Log/include
${EXTERNAL_LIBS_OUTPUT_PATH}/ffmpeg/include
)

2
utils/MediaBase/src/FfmpegMuxStreamV2.cpp
View File

@ -15,6 +15,7 @@
#include "FfmpegMuxStreamV2.h"
#include "FfmpegOutputStream.h"
#include "ILog.h"
#include "LinuxApi.h"
#include "MediaBase.h"
#include "StatusCode.h"
#ifdef __cplusplus
@ -60,6 +61,7 @@ StatusCode FfmpegMuxStreamV2::CloseOutputFile(void)
avio_closep(&mOutputFormat->pb);
}
avformat_free_context(mOutputFormat);
fx_system("sync");
return CreateStatusCode(STATUS_CODE_OK);
}
void FfmpegMuxStreamV2::GetStreamData(const void *data, const size_t &size, const StreamInfo &streamInfo)