Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2

pansen

2019-01-10 0436e5443295395025f89f0d091aab1e9551d1a4

 QiaoJiaSystem/StructureApp/NewEncodeVideo.cpp

@@ -19,7 +19,7 @@
        return ;
    }
    int size=m_hiredisTool.getSize(src_path);
    DBG("buf_size="<<size<<"  file_name="<<src_path);
  //  DBG("buf_size="<<size<<"  file_name="<<src_path);
    bool fileCreate = false;
    for(int i=0;i<size;++i)
    {
@@ -30,6 +30,7 @@
        if(!fileCreate)
        {
            fileCreate = true;
            DBG("fileCreate buf_size="<<size<<"  file_name="<<src_path);
             videoEncoderElement.threadInitial(getProperty("src_path"),img);

        }