Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt

@@ -93,15 +93,18 @@

    ../../../BasicPlatForm/libs/hiredis-master/lib
    ../../../BasicPlatForm/libs/mysqlpp/lib
    ../../../BasicPlatForm/libs/mysql/lib
)

add_executable(${PROJECT_NAME}

    ./pushStream/PushStreamAppPipeController.cpp
    ../GB28181DecoderModel/FFmpegDecoderJPG.cpp
    ../GB28181DecoderModel/GB28181Server.cpp
    ../GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
    #    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
    ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
    #       ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
#        ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
    ../VideoServer/QiaoJia/DB/LDBTool.cpp
    ./rpc/RtspAnalysServer.cpp
    RtspCaptureElement.cpp