diff --git a/utils/MediaBase/src/FfmpegMuxStreamV2.cpp b/utils/MediaBase/src/FfmpegMuxStreamV2.cpp index 6faf390..fbc736d 100644 --- a/utils/MediaBase/src/FfmpegMuxStreamV2.cpp +++ b/utils/MediaBase/src/FfmpegMuxStreamV2.cpp @@ -69,17 +69,6 @@ void FfmpegMuxStreamV2::GetStreamData(const void *data, const size_t &size, cons bool fileMuxing = false; fileMuxing = mVideoStream->CheckStreamHeader(data, size); if (fileMuxing) { - // av_dump_format(mOutputFormat, 0, "./test.mp4", 1); - // /* open the output file, if needed */ - // if (!(mOutputFormat->oformat->flags & AVFMT_NOFILE)) { - // ret = avio_open(&mOutputFormat->pb, "./test.mp4", AVIO_FLAG_WRITE); - // if (ret < 0) { - // char error_str[AV_ERROR_MAX_STRING_SIZE] = {0}; - // LogError("Could not open '%s': %s\n", - // "./test.mp4", - // av_make_error_string(error_str, AV_ERROR_MAX_STRING_SIZE, ret)); - // } - // } /* Write the stream header, if any. */ ret = avformat_write_header(mOutputFormat, nullptr); if (ret < 0) { diff --git a/utils/MediaBase/src/FfmpegOutputStream.cpp b/utils/MediaBase/src/FfmpegOutputStream.cpp index 4c36dd3..ca8620c 100644 --- a/utils/MediaBase/src/FfmpegOutputStream.cpp +++ b/utils/MediaBase/src/FfmpegOutputStream.cpp @@ -22,13 +22,19 @@ extern "C" { #include #include #include +#include #include +#include +#include +#include #ifdef __cplusplus } #endif #include +#include #include #include +#include FfmpegOutputStream::FfmpegOutputStream(const AVCodecID &encodecId, const AVCodecID &dncodecId) : mEncodecId(encodecId), mDeccodecId(dncodecId), mTmpPkt(nullptr), mStream(nullptr), mStreamHeaderWritten(false) { diff --git a/utils/MediaBase/src/FfmpegReadFile.cpp b/utils/MediaBase/src/FfmpegReadFile.cpp index f44b22f..0ced6c9 100644 --- a/utils/MediaBase/src/FfmpegReadFile.cpp +++ b/utils/MediaBase/src/FfmpegReadFile.cpp @@ -22,6 +22,7 @@ #ifdef __cplusplus extern "C" { #endif +#include #include #include #include diff --git a/utils/Servers/CMakeLists.txt b/utils/Servers/CMakeLists.txt index eb4eb66..d2b00b7 100755 --- a/utils/Servers/CMakeLists.txt +++ b/utils/Servers/CMakeLists.txt @@ -81,7 +81,7 @@ add_custom_target( curl DEPENDS openssl COMMAND echo "Build curl. openssl path = ${EXTERNAL_SOURCE_PATH}" - COMMAND ./configure --without-zlib --prefix=${EXTERNAL_SOURCE_PATH}/curl --with-ssl=${EXTERNAL_SOURCE_PATH}/openssl/build ${CURL_HOST} CC=${CMAKE_C_COMPILER} + COMMAND ./configure --disable-shared --without-zlib --prefix=${EXTERNAL_SOURCE_PATH}/curl --with-ssl=${EXTERNAL_SOURCE_PATH}/openssl/build ${CURL_HOST} CC=${CMAKE_C_COMPILER} COMMAND make COMMAND cp ${EXTERNAL_SOURCE_PATH}/curl/curl-8.1.2/lib/.libs/lib*.a ${LIBS_OUTPUT_PATH} COMMAND cp ${EXTERNAL_SOURCE_PATH}/openssl/build/lib/lib*.a ${LIBS_OUTPUT_PATH}