From f94a3015a1db74fec2ce47aaf77bc5a0dad28cae Mon Sep 17 00:00:00 2001 From: Hu Chunming <2657262686@qq.com> Date: Thu, 1 Aug 2024 15:16:52 +0800 Subject: [PATCH] ffmpeg改用静态库 --- build/demo/Makefile | 1 - build/src/Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build/demo/Makefile b/build/demo/Makefile index 1feb053..9d2ccca 100755 --- a/build/demo/Makefile +++ b/build/demo/Makefile @@ -28,7 +28,6 @@ include_dir=-I/usr/local/Ascend/ascend-toolkit/latest/aarch64-linux/include \ LIBS= -L $(DEPEND_DIR) -lvpt_det_vdec -lsycheck -lface_det_vdec -lhs_tri_process -lhs_truck_process -lhs_motor_process -lphone_motor_det -lhcp_vdec -lmotor_rainshed_vdec -ltraffic_light_vdec -lvehicle_pose_vdec -lroad_seg_vdec -lroad_3clsseg_vdec -latlaslic -lvpt_ascend\ -L $(OPENCV_ROOT)/lib -lopencv_world\ -L $(JSON_ROOT)/lib -ljsoncpp \ - -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice -lx264\ -L $(RABBITMQ_CLIENT_ROOT)/lib/aarch64-linux-gnu -lrabbitmq \ -L/usr/local/Ascend/ascend-toolkit/latest/runtime/lib64 -lacl_dvpp -lascendcl \ diff --git a/build/src/Makefile b/build/src/Makefile index 1e9672c..eb6d28d 100755 --- a/build/src/Makefile +++ b/build/src/Makefile @@ -42,7 +42,7 @@ LIBS= -L $(SPDLOG_ROOT)/lib -l:libspdlog.a \ -L $(DEPEND_DIR) -lvpt_det_vdec -lsycheck -lface_det_vdec -lhs_tri_process -lhs_truck_process -lphone_motor_det -lhcp_vdec -lmotor_rainshed_vdec -ltraffic_light_vdec -lvehicle_pose_vdec -lroad_seg_vdec -lroad_3clsseg_vdec -lhs_motor_process\ -L $(OPENCV_ROOT)/lib -lopencv_world\ -L $(JSON_ROOT)/lib -l:libjsoncpp.a \ - -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice -lx264\ + -L $(FFMPEG_ROOT)/lib -l:libavformat.a -l:libavcodec.a -l:libswscale.a -l:libavutil.a -l:libavfilter.a -l:libswresample.a -l:libavdevice.a -l:libx264.a\ -L $(RABBITMQ_CLIENT_ROOT)/lib/aarch64-linux-gnu -l:librabbitmq.a \ -L $(AUTHORITY_DIR)/lib -latlaslic \ -L $(JRTP_ROOT)/jrtplib/lib -l:libjrtp.a \ -- libgit2 0.21.4