Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

pansen

2019-04-22 4d1c2ee860222138fc7932225ea6d91e7483646a

 QiaoJiaSystem/VideoToImage/main.cpp

@@ -32,7 +32,7 @@
        ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
#endif

    appPref.setLongData("gpu.index", 0);
    appPref.setIntData("gpu.index", 0);
    appPref.setIntData("show.image", 0);