From 69895028b74737228e76005f88b9aaf95136ec96 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 29 七月 2019 11:49:08 +0800
Subject: [PATCH] 析构时，deleteCamera增加handle置位的操作，防止重复关闭报错

---
 csrc/ffmpeg/format/FormatIn.hpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/csrc/ffmpeg/format/FormatIn.hpp b/csrc/ffmpeg/format/FormatIn.hpp
index 32c8a81..4155aae 100644
--- a/csrc/ffmpeg/format/FormatIn.hpp
+++ b/csrc/ffmpeg/format/FormatIn.hpp
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <memory>
+#include "PsToEs.hpp"
 
 struct AVFormatContext;
 struct AVDictionary;
@@ -28,7 +29,8 @@
 		~FormatIn();
 		
 	public:
-		int openWithCustomIO(read_packet fn, AVDictionary **options=NULL);
+		int openWithCustomIO(void *opaque, read_packet fn, AVDictionary **options=NULL);
+        int openGb28181(const char *filename, AVDictionary **options);
 
 		int open(const char *filename, AVDictionary **options);
 		bool findStreamInfo(AVDictionary **options);
@@ -61,6 +63,7 @@
 		AVIOContext			*io_ctx_;
 		uint8_t 			*read_io_buff_;
 		const int 			read_io_buff_size_;
+		GB28181API			handle_gb28181;
 	};
 }
 

--
Gitblit v1.8.0