From 803388b511d31b9e25f6829298bb12e06323474c Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 17 七月 2019 13:37:47 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/valib/goffmpeg

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

diff --git a/csrc/ffmpeg/format/FormatIn.hpp b/csrc/ffmpeg/format/FormatIn.hpp
index 32c8a81..a19d0fe 100644
--- a/csrc/ffmpeg/format/FormatIn.hpp
+++ b/csrc/ffmpeg/format/FormatIn.hpp
@@ -28,7 +28,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);

--
Gitblit v1.8.0