From 6f27f088e5d9e828bdce65ab85984d2084bab222 Mon Sep 17 00:00:00 2001 From: pansen <pansen626@sina.com> Date: 星期三, 06 三月 2019 11:52:47 +0800 Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2 --- QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h index 1f495fc..a593baa 100644 --- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h +++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h @@ -13,13 +13,12 @@ #include <iostream> #include <unistd.h> #include <MyQueue.h> -#include <Debug.h> #include <atomic> -#include "GlobalSignalWaitLock.hpp" #include "opencv2/core.hpp" #include "opencv2/highgui.hpp" #include <list> +#include "GlobalSignalWaitLock.hpp" #include "basic_struct_for_video_image.h" extern "C" -- Gitblit v1.8.0