From 0ceb3acc2bbfd1cb0eded0492eb2a0e872046911 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Mon, 1 Jul 2024 14:16:35 +0800 Subject: [PATCH] Cross compile ffmpeg. --- external/ffmpeg/CMakeLists.txt | 6 +++--- utils/ConfigBase/CMakeLists.txt | 2 +- utils/MediaBase/src/FfmpegDecoder.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/external/ffmpeg/CMakeLists.txt b/external/ffmpeg/CMakeLists.txt index 949fc54..cb07aa9 100644 --- a/external/ffmpeg/CMakeLists.txt +++ b/external/ffmpeg/CMakeLists.txt @@ -30,10 +30,10 @@ else() --enable-gpl --enable-nonfree --enable-version3 --enable-small \ --disable-mipsdsp --disable-mipsdspr2 \ --disable-encoders \ - --disable-muxers --enable-muxer=mov --enable-muxer=mp4 \ - --disable-decoders --enable-decoder=aac \ + --disable-muxers --enable-muxer=mov --enable-muxer=mp4 --enable-encoder=mpeg4 \ + --enable-decoder=aac --enable-encoder=aac --enable-decoder=pcm_alaw --enable-encoder=pcm_alaw \ --disable-filters \ - --disable-demuxers --enable-demuxer=mov \ + --enable-demuxer=mov \ --disable-parsers \ --disable-protocols --enable-protocol=file \ --disable-bsfs --enable-bsf=aac_adtstoasc --enable-bsf=h264_mp4toannexb --enable-bsf=hevc_mp4toannexb \ diff --git a/utils/ConfigBase/CMakeLists.txt b/utils/ConfigBase/CMakeLists.txt index 40aed0d..02f41ca 100644 --- a/utils/ConfigBase/CMakeLists.txt +++ b/utils/ConfigBase/CMakeLists.txt @@ -19,7 +19,7 @@ aux_source_directory(./src SRC_FILES) set(TARGET_NAME ConfigBase) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) -target_link_libraries(${TARGET_NAME} StatusCode Log config) +target_link_libraries(${TARGET_NAME} StatusCode Log libconfig.a) add_custom_target( ConfigBase_code_check diff --git a/utils/MediaBase/src/FfmpegDecoder.cpp b/utils/MediaBase/src/FfmpegDecoder.cpp index 045cd77..9932ebd 100644 --- a/utils/MediaBase/src/FfmpegDecoder.cpp +++ b/utils/MediaBase/src/FfmpegDecoder.cpp @@ -44,7 +44,7 @@ bool FfmpegDecoder::Init(void) mCodec = (AVCodec *)avcodec_find_decoder(mCodecId); // mCodec = (AVCodec *)avcodec_find_decoder_by_name("libfdk_aac"); if (!(mCodec)) { - LogError("Codec not found\n"); + LogError("decoder not found:%s\n", avcodec_get_name(mCodecId)); return false; } mCodecCtx = avcodec_alloc_context3((const AVCodec *)(mCodec));