From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' into 1.3nsq

---
 QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
index cdfe87e..a7dbb3f 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
+++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
@@ -37,6 +37,7 @@
 }
 
 #include <mutex>
+#include <basic/pipe/TimerElement.h>
 
 namespace BASICGB28181 {
 

--
Gitblit v1.8.0