.3nsq: Auto stash before merge of "1.3nsq" and "origin/1.3nsq"

pans

2019-04-15 0a762a217fe499b7b63d55ed4b46dde1afd49f28

 QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h

@@ -37,6 +37,7 @@
}

#include <mutex>
#include <basic/pipe/TimerElement.h>

namespace BASICGB28181 {