Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/GB28181DecoderModel/SpinLock.hpp

@@ -6,7 +6,9 @@
#define GB28181SDK_SPINLOCK_H

#include <atomic>

/***
 * 自旋锁，可能会有没锁上的bug
 */
class SpinLock {
public:
    SpinLock() : m_lock(ATOMIC_FLAG_INIT) {}